Browse Source

configura docker e localização do webpack-stats.json

pull/2485/head
Leandro Roberto 7 years ago
parent
commit
8d605011e1
  1. 13
      Dockerfile
  2. 4
      sapl-frontend/src/apps/compilacao/js/old/compilacao.js
  3. 2
      sapl-frontend/vue.config.js
  4. 2
      sapl/settings.py
  5. 2
      sapl/static/js/compilacao.04e48cbd.js
  6. 8
      sapl/static/js/global.48a397da.js
  7. 5
      start.sh
  8. 2
      webpack-stats.json

13
Dockerfile

@ -2,7 +2,7 @@ FROM alpine:3.8
ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \ ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \
python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev \ python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev \
nodejs npm py3-lxml py3-magic postgresql-client poppler-utils antiword \ nodejs py3-lxml py3-magic postgresql-client poppler-utils antiword \
curl jq openssh-client vim openssh-client bash curl jq openssh-client vim openssh-client bash
RUN apk update --update-cache && apk upgrade RUN apk update --update-cache && apk upgrade
@ -17,9 +17,7 @@ RUN apk add --no-cache python3 nginx tzdata && \
rm -f /etc/nginx/conf.d/* rm -f /etc/nginx/conf.d/*
RUN mkdir -p /var/interlegis/sapl && \ RUN mkdir -p /var/interlegis/sapl && \
apk add --update --no-cache $BUILD_PACKAGES && \ apk add --update --no-cache $BUILD_PACKAGES
npm install -g bower && \
npm cache verify
WORKDIR /var/interlegis/sapl/ WORKDIR /var/interlegis/sapl/
@ -37,13 +35,6 @@ COPY config/env_dockerfile /var/interlegis/sapl/sapl/.env
# Configura timezone para BRT # Configura timezone para BRT
# RUN cp /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime && echo "America/Sao_Paulo" > /etc/timezone # RUN cp /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime && echo "America/Sao_Paulo" > /etc/timezone
# manage.py bower install bug: https://github.com/nvbn/django-bower/issues/51
# compilescss - Precompile all occurrences of your SASS/SCSS files for the whole project into css files
RUN python3 manage.py bower_install --allow-root && \
python3 manage.py compilescss
RUN python3 manage.py collectstatic --noinput --clear RUN python3 manage.py collectstatic --noinput --clear
# Remove .env(fake) e sapl.db da imagem # Remove .env(fake) e sapl.db da imagem

4
sapl-frontend/src/apps/compilacao/js/old/compilacao.js

@ -251,7 +251,7 @@ function DispositivoSearch (opts) {
_$('input[name="texto_dispositivo"]').val(formData.texto) _$('input[name="texto_dispositivo"]').val(formData.texto)
_$('select[name="max_results"]').val(formData.max_results) _$('select[name="max_results"]').val(formData.max_results)
} catch (e) { } catch (e) {
console.log(e) // console.log(e)
} }
setTimeout(function () { setTimeout(function () {
@ -261,7 +261,7 @@ function DispositivoSearch (opts) {
// modalDs.find('.btn-busca').trigger('click') // modalDs.find('.btn-busca').trigger('click')
// onChangeParamTA() // onChangeParamTA()
} catch (e) { } catch (e) {
console.log(e) // console.log(e)
} }
}, 200) }, 200)

2
sapl-frontend/vue.config.js

@ -54,7 +54,7 @@ module.exports = {
.plugin('RelativeBundleTrackerPlugin') .plugin('RelativeBundleTrackerPlugin')
.use(RelativeBundleTrackerPlugin, [{ .use(RelativeBundleTrackerPlugin, [{
path:'.', path:'.',
filename: '../sapl/static/webpack-stats.json' filename: '../webpack-stats.json'
}]) }])
config.resolve.alias config.resolve.alias

2
sapl/settings.py

@ -267,7 +267,7 @@ WEBPACK_LOADER = {
'DEFAULT': { 'DEFAULT': {
'CACHE': not DEBUG, 'CACHE': not DEBUG,
'BUNDLE_DIR_NAME': 'sapl/static/', 'BUNDLE_DIR_NAME': 'sapl/static/',
'STATS_FILE': BASE_DIR.child('static').child('webpack-stats.json'), 'STATS_FILE': PROJECT_DIR.child('webpack-stats.json'),
'POLL_INTERVAL': 0.1, 'POLL_INTERVAL': 0.1,
'TIMEOUT': None, 'TIMEOUT': None,
'IGNORE': [r'.+\.hot-update.js', r'.+\.map'] 'IGNORE': [r'.+\.hot-update.js', r'.+\.map']

2
sapl/static/js/compilacao.10aa09f7.js → sapl/static/js/compilacao.04e48cbd.js

File diff suppressed because one or more lines are too long

8
sapl/static/js/global.ade4fffd.js → sapl/static/js/global.48a397da.js

File diff suppressed because one or more lines are too long

5
start.sh

@ -46,14 +46,9 @@ create_env() {
create_env create_env
#python3 manage.py bower install
/bin/bash busy-wait.sh $DATABASE_URL /bin/bash busy-wait.sh $DATABASE_URL
# manage.py migrate --noinput nao funcionava
yes yes | python3 manage.py migrate yes yes | python3 manage.py migrate
# python3 manage.py collectstatic --no-input
## SOLR ## SOLR

2
sapl/static/webpack-stats.json → webpack-stats.json

@ -1 +1 @@
{"status":"done","publicPath":"/static/","chunks":{"compilacao":[{"name":"css/compilacao.8f6b7cdb.css","publicPath":"/static/css/compilacao.8f6b7cdb.css","path":"../sapl/static/css/compilacao.8f6b7cdb.css"},{"name":"js/compilacao.10aa09f7.js","publicPath":"/static/js/compilacao.10aa09f7.js","path":"../sapl/static/js/compilacao.10aa09f7.js"}],"global":[{"name":"css/global.f850b43e.css","publicPath":"/static/css/global.f850b43e.css","path":"../sapl/static/css/global.f850b43e.css"},{"name":"js/global.ade4fffd.js","publicPath":"/static/js/global.ade4fffd.js","path":"../sapl/static/js/global.ade4fffd.js"}],"sapl-oficial-theme":[{"name":"css/sapl-oficial-theme.3e31fc98.css","publicPath":"/static/css/sapl-oficial-theme.3e31fc98.css","path":"../sapl/static/css/sapl-oficial-theme.3e31fc98.css"},{"name":"js/sapl-oficial-theme.af3fd982.js","publicPath":"/static/js/sapl-oficial-theme.af3fd982.js","path":"../sapl/static/js/sapl-oficial-theme.af3fd982.js"}]}} {"status":"done","publicPath":"/static/","chunks":{"compilacao":[{"name":"css/compilacao.8f6b7cdb.css","publicPath":"/static/css/compilacao.8f6b7cdb.css","path":"../sapl/static/css/compilacao.8f6b7cdb.css"},{"name":"js/compilacao.04e48cbd.js","publicPath":"/static/js/compilacao.04e48cbd.js","path":"../sapl/static/js/compilacao.04e48cbd.js"}],"global":[{"name":"css/global.f850b43e.css","publicPath":"/static/css/global.f850b43e.css","path":"../sapl/static/css/global.f850b43e.css"},{"name":"js/global.48a397da.js","publicPath":"/static/js/global.48a397da.js","path":"../sapl/static/js/global.48a397da.js"}],"sapl-oficial-theme":[{"name":"css/sapl-oficial-theme.3e31fc98.css","publicPath":"/static/css/sapl-oficial-theme.3e31fc98.css","path":"../sapl/static/css/sapl-oficial-theme.3e31fc98.css"},{"name":"js/sapl-oficial-theme.af3fd982.js","publicPath":"/static/js/sapl-oficial-theme.af3fd982.js","path":"../sapl/static/js/sapl-oficial-theme.af3fd982.js"}]}}
Loading…
Cancel
Save