From 4334b58c54c1d9b6cd7441b00c7234d82b42e56c Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Sun, 17 Feb 2019 15:14:09 +0100 Subject: [PATCH] :bug: Fix default value of environment variables --- backend/Dockerfile | 22 ++++++++++------------ docker-compose.yml | 34 ++++++++++++++++------------------ 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 6601d5dd3..4d213c27d 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -21,23 +21,21 @@ COPY --from=0 /home/uxbox/backend/dist/uxbox-backend.jar /srv/uxbox/app.jar COPY --from=0 /home/uxbox/backend/docker-entrypoint.sh /entrypoint.sh ENV UXBOX_HTTP_SERVER_DEBUG=false \ - UXBOX_DATABASE_USERNAME=uxbox \ - UXBOX_DATABASE_PASSWORD=youshouldoverwritethiswithsomethingelse \ - UXBOX_DATABASE_NAME=uxbox \ - UXBOX_DATABASE_SERVER=localhost \ + UXBOX_DATABASE_USERNAME="uxbox" \ + UXBOX_DATABASE_PASSWORD="youshouldoverwritethiswithsomethingelse" \ + UXBOX_DATABASE_NAME="uxbox" \ + UXBOX_DATABASE_SERVER="localhost" \ UXBOX_DATABASE_PORT=5432 \ - UXBOX_EMAIL_REPLY_TO=no-reply@uxbox.io \ - UXBOX_EMAIL_FROM=no-reply@uxbox.io \ - UXBOX_SMTP_HOST=localhost \ + UXBOX_EMAIL_REPLY_TO="no-reply@uxbox.io" \ + UXBOX_EMAIL_FROM="no-reply@uxbox.io" \ + UXBOX_SMTP_HOST="localhost" \ UXBOX_SMTP_PORT=25 \ - UXBOX_SMTP_USER=uxbox \ - UXBOX_SMTP_PASSWORD=youshouldoverwritethiswithsomethingelse \ + UXBOX_SMTP_USER="uxbox" \ + UXBOX_SMTP_PASSWORD="youshouldoverwritethiswithsomethingelse" \ UXBOX_SMTP_SSL=false \ UXBOX_SMTP_TLS=false \ UXBOX_SMTP_ENABLED=false \ - # WARNING: this is a default secret key and - # it should be overwritten in production env. - UXBOX_SECRET=5qjiAn-QUpawUNqGP10UZKklSqbLKcdGY3sJpq0UUACpVXGg2HOFJCBejDWVHskhRyp7iHb4rjOLXX2ZjF-5cw + UXBOX_SECRET="" RUN set -ex; \ chmod 755 /entrypoint.sh; \ diff --git a/docker-compose.yml b/docker-compose.yml index 6cfd640af..31f0b3b4c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,28 +32,26 @@ services: - "6060:6060" environment: # HTTP setup - - "UXBOX_HTTP_SERVER_DEBUG=false" + - UXBOX_HTTP_SERVER_DEBUG=false # Database setup - - "UXBOX_DATABASE_USERNAME=uxbox" - - "UXBOX_DATABASE_PASSWORD=uxbox_postgres_password" - - "UXBOX_DATABASE_NAME=uxbox" - - "UXBOX_DATABASE_SERVER=db" - - "UXBOX_DATABASE_PORT=5432" + - UXBOX_DATABASE_USERNAME="uxbox" + - UXBOX_DATABASE_PASSWORD="uxbox_postgres_password" + - UXBOX_DATABASE_NAME="uxbox" + - UXBOX_DATABASE_SERVER="db" + - UXBOX_DATABASE_PORT=5432 # Mail setup - - "UXBOX_EMAIL_REPLY_TO=no-reply@uxbox.io" - - "UXBOX_EMAIL_FROM=no-reply@uxbox.io" + - UXBOX_EMAIL_REPLY_TO="no-reply@uxbox.io" + - UXBOX_EMAIL_FROM="no-reply@uxbox.io" # STMP setup - - "UXBOX_SMTP_HOST=localhost" - - "UXBOX_SMTP_PORT=25" - - "UXBOX_SMTP_USER=uxbox" - - "UXBOX_SMTP_PASSWORD=youshouldoverwritethiswithsomethingelse" - - "UXBOX_SMTP_SSL=false" - - "UXBOX_SMTP_TLS=false" - - "UXBOX_SMTP_ENABLED=false" + - UXBOX_SMTP_HOST="localhost" + - UXBOX_SMTP_PORT=25 + - UXBOX_SMTP_USER="uxbox" + - UXBOX_SMTP_PASSWORD="youshouldoverwritethiswithsomethingelse" + - UXBOX_SMTP_SSL=false + - UXBOX_SMTP_TLS=false + - UXBOX_SMTP_ENABLED=false # Security setup - # WARNING: this is a default secret key and - # it should be overwritten in production env. - - "UXBOX_SECRET=5qjiAn-QUpawUNqGP10UZKklSqbLKcdGY3sJpq0UUACpVXGg2HOFJCBejDWVHskhRyp7iHb4rjOLXX2ZjF-5cw" + - UXBOX_SECRET="" volumes: - /srv/uxbox/backend/resources:/srv/uxbox/resources - /etc/localtime:/etc/localtime:ro