X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=dashboard%2Fdocker-compose.yml;h=eac84e6ead560a0ab526d65c7bb3a05ec10849ea;hb=e6a645f4128a803d4f5972b1ca548f67576760fa;hp=4e57ff3830e536f32e6e6427c0b295ac400bdea8;hpb=2ea6c6198bc2aac73b04edad8c5a10d5534cdc2e;p=pharos-tools.git

diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml
index 4e57ff3..eac84e6 100644
--- a/dashboard/docker-compose.yml
+++ b/dashboard/docker-compose.yml
@@ -1,15 +1,14 @@
 ---
 ##############################################################################
 # Copyright (c) 2016 Max Breitenfeldt and others.
+# Copyright (c) 2018 Parker Berberian, Sawyer Bergeron, and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
-
-version: '2'
+version: '3'
 services:
     nginx:
         restart: always
@@ -19,39 +18,36 @@ services:
             - "80:80"
         volumes:
             - ./config/nginx:/etc/nginx/conf.d
-            - /var/lib/pharos_dashboard/static:/static
-            - /var/lib/pharos_dashboard/media:/media
+            - pharos-static:/static:ro
+            - pharos-media:/media
         depends_on:
             - web
 
     web:
+        image: opnfv/pharos-tools-laas-dashboard:latest
         restart: always
-        build: ./web/
         container_name: dg01
-        # yamllint disable rule:line-length
-        command: bash -c "python manage.py migrate && python manage.py collectstatic --no-input && gunicorn pharos_dashboard.wsgi -b 0.0.0.0:8000"
-        # yamllint enable rule:line-length
         depends_on:
             - postgres
         links:
             - postgres
         env_file: config.env
         volumes:
-            - ./:/pharos_dashboard
-            - /var/lib/pharos_dashboard/static:/static
-            - /var/lib/pharos_dashboard/media:/media
+            - pharos-static:/static
+            - pharos-media:/media
         expose:
             - "8000"
 
     postgres:
         restart: always
-        image: postgres:latest
+        image: postgres:10
         container_name: ps01
         env_file: config.env
         volumes:
             - pharos-data:/var/lib/postgresql/data
 
     rabbitmq:
+        restart: always
         image: rabbitmq
         container_name: rm01
         env_file: config.env
@@ -59,17 +55,14 @@ services:
             - "5672:5672"
 
     worker:
+        image: opnfv/pharos-tools-laas-celery:latest
         restart: always
-        build: ./worker/
-        # yamllint disable rule:line-length
-        command: bash -c "celery -A pharos_dashboard worker -l info -B --schedule=~/celerybeat-schedule"
-        # yamllint enable rule:line-length
         env_file: config.env
         links:
             - postgres
             - rabbitmq
-        volumes:
-            - ./:/pharos_dashboard
 volumes:
+    pharos-media:
+    pharos-static:
     pharos-data:
         external: true