From 93cf2b36f3165d2381df0a6b0a57f8b6fe134a48 Mon Sep 17 00:00:00 2001 From: Edward Date: Tue, 9 May 2017 22:00:41 -0300 Subject: [PATCH] Docker debug (#1072) * Habilita debug * point to experimental tag * Fix dev-requirements.txt * Bumping sass processor * Change bower install call --- Dockerfile | 5 ++--- config/env-sample | 2 +- config/env_dockerfile | 2 +- requirements/requirements.txt | 2 +- start.sh | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e690045ec..2455200e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,8 @@ COPY config/env_dockerfile /var/interlegis/sapl/sapl/.env # manage.py bower install bug: https://github.com/nvbn/django-bower/issues/51 RUN python3 manage.py bower_install -- --allow-root --no-input && \ - python3 manage.py collectstatic --no-input - -RUN rm -rf /var/interlegis/sapl/sapl/.env && \ + python3 manage.py collectstatic --no-input && \ + rm -rf /var/interlegis/sapl/sapl/.env && \ rm -rf /var/interlegis/sapl/sapl.db RUN chmod +x /var/interlegis/sapl/start.sh && \ diff --git a/config/env-sample b/config/env-sample index c358f9017..33fed9806 100644 --- a/config/env-sample +++ b/config/env-sample @@ -1,6 +1,6 @@ DATABASE_URL = postgresql://postgres:@sapldb:/sapl KEY -DEBUG = False +DEBUG = True EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = '' diff --git a/config/env_dockerfile b/config/env_dockerfile index c83fc88f1..f4a9291f7 100644 --- a/config/env_dockerfile +++ b/config/env_dockerfile @@ -1,6 +1,6 @@ DATABASE_URL = sqlite:///sapl.db SECRET_KEY = 'Dockerfile_Key' -DEBUG = False +DEBUG = True EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = '' diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7fd7dbd80..9c49a47f2 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -15,7 +15,7 @@ django-extra-views==0.8.0 django-filter==0.15.3 django-floppyforms==1.6.2 django-model-utils==2.5 -django-sass-processor==0.5.3 +django-sass-processor==0.5.4 djangorestframework drfdocs easy-thumbnails==2.3 diff --git a/start.sh b/start.sh index 1b00801a2..8a213affd 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-False}" >> $FILENAME + echo "DEBUG = ""${DEBUG-True}" >> $FILENAME echo "EMAIL_USE_TLS = ""${USE_TLS-True}" >> $FILENAME echo "EMAIL_PORT = ""${EMAIL_PORT-587}" >> $FILENAME echo "EMAIL_HOST = ""${EMAIL_HOST-''}" >> $FILENAME