From db79c4c72d949c499ef2ad77f0ac0a3a983663a7 Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Mon, 31 Oct 2016 16:15:53 +0100 Subject: [PATCH] removal of .env file --- .env | 9 --------- docker-compose.yml | 13 ++++++++++++- production.yml | 13 ++++++++++++- 3 files changed, 24 insertions(+), 11 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index a2d402c..0000000 --- a/.env +++ /dev/null @@ -1,9 +0,0 @@ -# Add Environment Variables - - -SECRET_KEY=5(15ds+i2+%ik6z&!yer+ga9m=e%jcqiz_5wszg)r-z!2--b2d -DB_NAME=postgres -DB_USER=postgres -DB_PASS=postgres -DB_SERVICE=postgres -DB_PORT=5432 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 35238e5..4227052 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,14 @@ web: volumes: - /usr/src/app - /usr/src/app/static - env_file: .env environment: DEBUG: 'true' + SECRET_KEY: '5(15ds+i2+%ik6z&!yer+ga9m=e%jcqiz_5wszg)r-z!2--b2d' + DB_NAME: postgres + DB_USER: postgres + DB_PASS: postgres + DB_SERVICE: postgres + DB_PORT: 5432 command: /usr/local/bin/gunicorn docker_django.wsgi:application -w 2 -b :8000 nginx: @@ -33,6 +38,12 @@ postgres: - "5432:5432" volumes: - pgdata:/var/lib/postgresql/data/ + environment: + DB_NAME: postgres + DB_USER: postgres + DB_PASS: postgres + DB_SERVICE: postgres + DB_PORT: 5432 redis: restart: always diff --git a/production.yml b/production.yml index 03422c4..e7ecdae 100644 --- a/production.yml +++ b/production.yml @@ -6,7 +6,12 @@ web: links: - postgres:postgres - redis:redis - env_file: .env + environment: + DEBUG: 'False' + SECRET_KEY: '5(15ds+i2+%ik6z&!yer+ga9m=e%jcqiz_5wszg)r-z!2--b2d' + DB_NAME: postgres + DB_USER: postgres + DB_PASS: postgres command: /usr/local/bin/gunicorn docker_django.wsgi:application -w 2 -b :8000 nginx: @@ -28,6 +33,12 @@ postgres: - "5432" volumes: - pgdata:/var/lib/postgresql/data/ + environment: + DB_NAME: postgres + DB_USER: postgres + DB_PASS: postgres + DB_SERVICE: postgres + DB_PORT: 5432 redis: restart: always