Revert "Because of nginx-proxy/nginx-proxy#304, right now docker-comp…

…ose.prod.yml is ported back to version 1" This reverts commit 0b2cfa5.
noisy · Jun 3, 2016 · 4bd861a · 4bd861a
1 parent 4f99433
commit 4bd861a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 52 deletions.
diff --git a/Dockerfile → compose/django/Dockerfile b/Dockerfile → compose/django/Dockerfile
diff --git a/compose/production.yml b/compose/production.yml
@@ -0,0 +1,48 @@
+version: '2'
+services:
+  postgres:
+    build: ./postgres
+    volumes:
+      - /data/spistresci/postgres:/var/lib/postgresql/data
+      - /data/spistresci/postgres-backups:/backups
+    env_file: ../.env
+
+  django:
+    build:
+      context: ..
+      dockerfile: compose/django/Dockerfile
+    user: django
+    depends_on:
+      - postgres
+      - redis
+    command: /gunicorn.sh
+    env_file: ../.env
+
+  nginx:
+    build: ./nginx
+    depends_on:
+      - django
+    env_file: ../.env
+
+  redis:
+    image: redis:3.0
+
+  celeryworker:
+    build:
+      context: ..
+    user: django
+    env_file: ../.env
+    depends_on:
+     - postgres
+     - redis
+    command: celery -A spistresci.taskapp worker -l INFO
+
+  celerybeat:
+    build:
+      context: ..
+    user: django
+    env_file: ../.env
+    depends_on:
+      - postgres
+      - redis
+    command: celery -A spistresci.taskapp beat -l INFO
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml