diff options
| author | 2019-09-30 12:24:16 +0200 | |
|---|---|---|
| committer | 2019-09-30 12:24:16 +0200 | |
| commit | 413d7ba14dc9ea189a57ac38cc2c3dd2fdea1030 (patch) | |
| tree | 99a76d6169c04468a5dd3194979bd2b64daf1a7f /docker-compose.yml | |
| parent | Reject unhidden note or hidden warning infraction (diff) | |
| parent | Correct the Dockerfile path for azure. (diff) | |
Merge branch 'master' into decoupling-warnings-and-notes
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 4ea110c4..3a2e5398 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,8 +22,14 @@ services: web: build: context: . - dockerfile: docker/app/local.Dockerfile - command: docker/app/scripts/migrate_and_serve.sh + dockerfile: docker/Dockerfile + command: ["run", "--debug"] + networks: + default: + aliases: + - api.web + - admin.web + - staff.web ports: - "127.0.0.1:8000:8000" depends_on: @@ -33,7 +39,6 @@ services: - staticfiles:/var/www/static environment: DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite - DEBUG: "true" SECRET_KEY: suitable-for-development-only STATIC_ROOT: /var/www/static |