Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removal of .env file #37

Closed
wants to merge 2 commits into from
Closed

removal of .env file #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db79c4c
removal of .env file
bmanojlovic Oct 31, 2016
76a8b09
Merge remote-tracking branch 'upstream/master' into remove_env_file_36
bmanojlovic Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .env
View file
Open in desktop

This file was deleted.

13 changes: 12 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
12 changes: 12 additions & 0 deletions production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ web:
links:
- postgres:postgres
- redis:redis
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
volumes:
- /usr/src/app/static
env_file: .env
Expand All @@ -30,6 +36,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
Expand Down