diff options
| author |  Johannes Christ <[email protected]> | 2019-04-07 19:39:52 +0200 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-04-07 19:39:52 +0200 |
| commit | 7e9133d1ac2b4cb82a9ee0dead37f342933ce8d4 (patch) | |
| tree | 787f45a1ba5e1f16b9cd7d9e8cdf660573914151 /docker-compose.yml | |
| parent | Set `harakiri = 30`. (diff) | |
| parent | Address review by @jchristgit (diff) | |
Merge pull request #198 from gdude2002/django+176/project-layout
[Fixes #158, #160, #176, #193] Project layout changes
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 1f101c0b..04ec51de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,13 +10,6 @@ version: "3.6" services: - bot: - image: pythondiscord/bot:django - environment: - BOT_TOKEN: ${BOT_TOKEN?bot token needs to be set} - # Set me once you configured me in the Django Admin! - BOT_API_KEY: ${BOT_API_KEY} - postgres: image: postgres:11-alpine environment: @@ -27,7 +20,7 @@ services: web: build: context: . - dockerfile: docker/app/alpine/3.7/Dockerfile + dockerfile: docker/app/Dockerfile command: docker/app/migrate_and_serve.sh ports: - "127.0.0.1:8000:8000" @@ -35,9 +28,14 @@ services: - postgres volumes: - .:/app:ro + - staticfiles:/var/www/static environment: DATABASE_URL: postgres://pysite:supersecretpassword@postgres/pysite DEBUG: "true" SECRET_KEY: suitable-for-development-only + STATIC_ROOT: /var/www/static + +volumes: + staticfiles: # vim: sw=2 ts=2: |