Merge pull request #83 from BBVA/develop

quickstart change
BBVA · Feb 8, 2018 · eb52c91 · eb52c91
2 parents dcaed8d + 165f2d1
commit eb52c91
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 34 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,3 +14,37 @@ services:
     image: redis:3-alpine
     ports:
       - 6379:6379
+
+  deeptracy:
+    image: bbvalabs/deeptracy:latest
+    depends_on:
+      - redis
+      - postgres
+    environment:
+      - BROKER_URI=redis://redis:6379
+      - DATABASE_URI=postgresql://postgres:postgres@postgres:5433/deeptracy
+      - POSTGRES_URI=postgresql://postgres:postgres@postgres:5433
+      - SHARED_VOLUME_PATH=/tmp/deeptracy
+      - LOCAL_PRIVATE_KEY_FILE=/root/.ssh/id_rsa
+      - PATTON_URI=http://localhost:8000
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /tmp:/tmp
+      - ./private_key:/root/.ssh/
+    privileged: true
+    command: ["./init_patton_db.sh"]
+
+  deeptracy-api:
+    image: bbvalabs/deeptracy-api
+    depends_on:
+      - redis
+      - postgres
+    ports:
+      - 8080:8080
+    environment:
+      - BROKER_URI=redis://redis:6379
+      - DATABASE_URI=postgresql://postgres:postgres@postgres:5433/deeptracy
+      - SERVER_ADDRESS=0.0.0.0:8080
+      - GUNICORN_WORKERS=1
+      - LOG_LEVEL=INFO
+    command: ["./wait-for-it.sh", "postgres:5433", "--", "/opt/deeptracy/run.sh"]
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -15,40 +15,56 @@ First of run Patton Server
 -----------------------
 .. code-block:: file
 
-    version: '3'
-
-    services:
-      deeptracy:
-        image: bbvalabs/deeptracy:latest
-        depends_on:
-          - redis
-          - postgres
-        environment:
-          - BROKER_URI=redis://redis:6379
-          - DATABASE_URI=postgresql://postgres:postgres@postgres:5433/deeptracy
-          - POSTGRES_URI=postgresql://postgres:postgres@postgres:5433
-          - SHARED_VOLUME_PATH=/tmp/deeptracy
-          - LOCAL_PRIVATE_KEY_FILE=/root/.ssh/id_rsa
-          - PATTON_URI=http://localhost:8000
-        volumes:
-          - /var/run/docker.sock:/var/run/docker.sock
-          - /tmp:/tmp
-          - ./private_key:/root/.ssh/
-        privileged: true
-        command: ["./init_patton_db.sh"]
-
-      postgres:
-        image: postgres:9.6-alpine
-        ports:
-          - 5433:5433
-        environment:
-          - POSTGRES_PASSWORD=postgres
-        command: -p 5433
-
-      redis:
-        image: redis:3-alpine
-        ports:
-          - 6379:6379
+version: '3'
+
+services:
+
+  postgres:
+    image: postgres:9.6-alpine
+    environment:
+      - POSTGRES_PASSWORD=postgres
+    ports:
+      - 5433:5433
+    command: -p 5433
+
+  redis:
+    image: redis:3-alpine
+    ports:
+      - 6379:6379
+
+  deeptracy:
+    image: bbvalabs/deeptracy:latest
+    depends_on:
+      - redis
+      - postgres
+    environment:
+      - BROKER_URI=redis://redis:6379
+      - DATABASE_URI=postgresql://postgres:postgres@postgres:5433/deeptracy
+      - POSTGRES_URI=postgresql://postgres:postgres@postgres:5433
+      - SHARED_VOLUME_PATH=/tmp/deeptracy
+      - LOCAL_PRIVATE_KEY_FILE=/root/.ssh/id_rsa
+      - PATTON_URI=http://localhost:8000
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /tmp:/tmp
+      - ./private_key:/root/.ssh/
+    privileged: true
+    command: ["./init_patton_db.sh"]
+
+  deeptracy-api:
+    image: bbvalabs/deeptracy-api
+    depends_on:
+      - redis
+      - postgres
+    ports:
+      - 8080:8080
+    environment:
+      - BROKER_URI=redis://redis:6379
+      - DATABASE_URI=postgresql://postgres:postgres@postgres:5433/deeptracy
+      - SERVER_ADDRESS=0.0.0.0:8080
+      - GUNICORN_WORKERS=1
+      - LOG_LEVEL=INFO
+    command: ["./wait-for-it.sh", "postgres:5433", "--", "/opt/deeptracy/run.sh"]
 
 
 3 - Execute the docker-compose file