From d19d6cf6e24480b91fff9e789dde4188700fc223 Mon Sep 17 00:00:00 2001 From: Matheus Veleci Date: Wed, 10 May 2017 10:36:54 -0300 Subject: [PATCH] =?UTF-8?q?Fix=20das=20vari=C3=A1veis=20de=20DEBUG=20do=20?= =?UTF-8?q?=C3=BAltimo=20commit(#1072)=20e=20adiciona=20o=20comando=20comp?= =?UTF-8?q?ilescss=20no=20Dockerfile,=20para=20compilar=20os=20arquivos=20?= =?UTF-8?q?SASS/SCSS=20em=20ambiente=20de=20produ=C3=A7=C3=A3o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 +++ config/env-sample | 4 ++-- config/env_dockerfile | 2 +- start.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2455200e1..838257c66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,10 @@ COPY config/env_dockerfile /var/interlegis/sapl/sapl/.env # 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 --no-input && \ + python3 manage.py compilescss && \ python3 manage.py collectstatic --no-input && \ rm -rf /var/interlegis/sapl/sapl/.env && \ rm -rf /var/interlegis/sapl/sapl.db diff --git a/config/env-sample b/config/env-sample index 33fed9806..bde081a92 100644 --- a/config/env-sample +++ b/config/env-sample @@ -1,6 +1,6 @@ DATABASE_URL = postgresql://postgres:@sapldb:/sapl -KEY -DEBUG = True +KEY +DEBUG = False EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = '' diff --git a/config/env_dockerfile b/config/env_dockerfile index f4a9291f7..c83fc88f1 100644 --- a/config/env_dockerfile +++ b/config/env_dockerfile @@ -1,6 +1,6 @@ DATABASE_URL = sqlite:///sapl.db SECRET_KEY = 'Dockerfile_Key' -DEBUG = True +DEBUG = False EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = '' diff --git a/start.sh b/start.sh index 8a213affd..1b00801a2 100755 --- a/start.sh +++ b/start.sh @@ -27,7 +27,7 @@ create_env() { echo "SECRET_KEY="$KEY > $FILENAME # now only appends echo "DATABASE_URL = "$DATABASE_URL >> $FILENAME - echo "DEBUG = ""${DEBUG-True}" >> $FILENAME + echo "DEBUG = ""${DEBUG-False}" >> $FILENAME echo "EMAIL_USE_TLS = ""${USE_TLS-True}" >> $FILENAME echo "EMAIL_PORT = ""${EMAIL_PORT-587}" >> $FILENAME echo "EMAIL_HOST = ""${EMAIL_HOST-''}" >> $FILENAME