Skip to content

Anonymize docker compose #188

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

Open
rca wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Anonymize docker compose #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad206b0
Add .env to .gitignore
rca Jun 12, 2017
5dd6444
Remove hardcoded environment from docker-compose.yml
rca Jun 12, 2017
e5c1623
Update postgres to the official image
rca Jun 12, 2017
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ localshop.db
.coverage
.cache
/coverage.xml
.env
22 changes: 11 additions & 11 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
db:
image: sameersbn/postgresql:9.4
image: postgres:9.6
environment:
- DB_NAME=localshop
- DB_USER=localshop
- DB_PASS=shopping
- POSTGRES_DB
- POSTGRES_USER
- POSTGRES_PASSWORD
ports:
- "5432"
volumes:
Expand All @@ -16,9 +16,9 @@ web:
links:
- db:db
environment:
- DJANGO_SECRET_KEY=a7d03faa0c054b3dba38b396bf3c7996
- DATABASE_URL=postgresql://localshop:shopping@db/localshop
- DJANGO_MEDIA_ROOT=/localshop/media
- DJANGO_SECRET_KEY
- DATABASE_URL
- DJANGO_MEDIA_ROOT
ports:
- "8000:8000"
command: uwsgi --http 0.0.0.0:8000 --module localshop.wsgi --master --die-on-term
Expand All @@ -31,10 +31,10 @@ worker:
links:
- db:db
environment:
- DJANGO_SECRET_KEY=a7d03faa0c054b3dba38b396bf3c7996
- DATABASE_URL=postgresql://localshop:shopping@db/localshop
- DJANGO_MEDIA_ROOT=/localshop/media
- DJANGO_SECRET_KEY
- DATABASE_URL
- DJANGO_MEDIA_ROOT
entrypoint:
localshop
command:
command:
celery worker -B -E