diff options
| author |  S. Co1 <[email protected]> | 2019-09-24 13:54:40 -0400 |
|---|---|---|
| committer | S. Co1 <[email protected]> | 2019-09-24 13:54:40 -0400 |
| commit | 20b19de0d22e33476ac082ea048476f9f8c1a5ed (patch) | |
| tree | f1541776183c3d3850693ad20d81fb530bed3a1d /docker-compose.yml | |
| parent | Apply suggestions from code review (diff) | |
| parent | Swap out old discord shield for new one. (diff) | |
Merge branch 'master' into update-linting
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index d415340b..4ea110c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,13 +16,13 @@ services: - "127.0.0.1:7777:5432" environment: POSTGRES_DB: pysite - POSTGRES_PASSWORD: supersecretpassword + POSTGRES_PASSWORD: pysite POSTGRES_USER: pysite web: build: context: . - dockerfile: docker/app/Dockerfile.local + dockerfile: docker/app/local.Dockerfile command: docker/app/scripts/migrate_and_serve.sh ports: - "127.0.0.1:8000:8000" @@ -32,7 +32,7 @@ services: - .:/app:ro - staticfiles:/var/www/static environment: - DATABASE_URL: postgres://pysite:supersecretpassword@postgres:5432/pysite + DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite DEBUG: "true" SECRET_KEY: suitable-for-development-only STATIC_ROOT: /var/www/static |