Because of nginx-proxy/nginx-proxy#304, right now docker-compose.prod…

….yml is ported back to version 1
noisy · Apr 12, 2016 · 0b2cfa5 · 0b2cfa5
1 parent 93836c5
commit 0b2cfa5
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 49 deletions.
diff --git a/compose/django/Dockerfile → Dockerfile b/compose/django/Dockerfile → Dockerfile
diff --git a/compose/production.yml b/compose/production.yml
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -0,0 +1,42 @@
+postgres:
+  build: ./compose/postgres
+  volumes:
+    - /data/spistresci/postgres:/var/lib/postgresql/data
+    - /data/spistresci/postgres-backups:/backups
+  env_file: .env
+
+django:
+  build: .
+  user: django
+  links:
+    - postgres
+    - redis
+  command: /gunicorn.sh
+  env_file: .env
+
+nginx:
+  build: ./compose/nginx/
+  links:
+    - django
+  env_file: .env
+
+redis:
+  image: redis:3.0
+
+celeryworker:
+  build: .
+  user: django
+  env_file: .env
+  links:
+   - postgres
+   - redis
+  command: celery -A spistresci.taskapp worker -l INFO
+
+celerybeat:
+  build: .
+  user: django
+  env_file: .env
+  links:
+    - postgres
+    - redis
+  command: celery -A spistresci.taskapp beat -l INFO
diff --git a/env.example b/env.example
@@ -20,3 +20,4 @@ DJANGO_OPBEAT_ORGANIZATION_ID
 DJANGO_OPBEAT_APP_ID
 DJANGO_OPBEAT_SECRET_TOKEN
 
+VIRTUAL_HOST=