diff options
| author |  Matteo Bertucci <[email protected]> | 2019-09-30 17:58:29 +0200 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-09-30 17:58:29 +0200 |
| commit | f47351c1c2b3ac644b695bca03d74469412024f5 (patch) | |
| tree | fda470c0b1524679594db1a0bae20c7dab57c570 /docker-compose.yml | |
| parent | Add jump url (diff) | |
| parent | Adjust development workflow inline with new `site` changes. (#464) (diff) | |
Merge branch 'master' into reminder-up
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 4b0dcff35..9684a3c62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,6 @@ version: "3.7" services: postgres: image: postgres:11-alpine - ports: - - "127.0.0.1:7777:5432" environment: POSTGRES_DB: pysite POSTGRES_PASSWORD: pysite @@ -16,15 +14,31 @@ services: web: image: pythondiscord/site:latest - command: > - bash -c "echo \"from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin', 'admin') if not User.objects.filter(username='admin').exists() else print('Admin user already exists')\" | python manage.py shell - && ./manage.py runserver 0.0.0.0:8000" + command: ["run", "--debug"] + networks: + default: + aliases: + - api.web + - admin.web + - staff.web ports: - "127.0.0.1:8000:8000" depends_on: - postgres environment: DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite - DEBUG: "true" SECRET_KEY: suitable-for-development-only STATIC_ROOT: /var/www/static + + bot: + build: + context: . + dockerfile: Dockerfile + volumes: + - ./logs:/bot/logs + - .:/bot:ro + depends_on: + - web + environment: + BOT_TOKEN: ${BOT_TOKEN} + BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531 |