From 8f7e1ef1e6a5a7644512cb4a039068fe83613ab4 Mon Sep 17 00:00:00 2001
From: Daniel Seybold <daniel.seybold@uni-ulm.de>
Date: Wed, 19 Dec 2018 09:22:21 +0100
Subject: [PATCH] updated docker-compose with new naming of repositories

---
 docker-compose.yml | 102 ++++++++++++++++++++++++---------------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 63015f2..a72c69c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
 version: '2'
 
 services:
-  colosseum-store:
+
+####### Cloudiator components #########
+  cloudiator-store:
     image: mariadb:latest
     restart: always
     environment:
@@ -11,55 +13,45 @@ services:
       - MYSQL_PASSWORD=${DATABASE_PASSWORD}
     command: mysqld --character-set-server=utf8  --collation-server=utf8_general_ci
     volumes:
-      - /var/lib/cloudiator/colosseum-store/:/var/lib/mysql
-  colosseum-service:
+      - /var/lib/cloudiator/cloudiator-store/:/var/lib/mysql
+  cloudiator-store-phpmyadmin:
     depends_on:
-      - "colosseum-store"
-    image: omi-registry.e-technik.uni-ulm.de/dbms-jungle-explorer/db-evaluator-colosseum:latest
-    restart: always
-    environment:
-      - MYSQL_USER=${DATABASE_USER}
-      - MYSQL_PW=${DATABASE_PASSWORD}
-      - MYSQL_DB=${DATABASE_DB}
-      - MYSQL_HOST=colosseum-store
-      - ETCD_HOST=colosseum-etcd
-    ports:
-      - 9000:9000
-    volumes:
-      - /var/log/db-evaluator-colosseum:/opt/docker-init/logs
-  colosseum-phpmyadmin:
-    depends_on:
-      - "colosseum-store"
+      - "cloudiator-store"
     image: phpmyadmin/phpmyadmin:4.7
     restart: always
     environment:
-      - PMA_HOST=colosseum-store
+      - PMA_HOST=cloudiator-store
       # uncomment to be enable auto login 
       #- PMA_USER=${DATABASE_USER}
       #- PMA_PASSWORD=${DATABASE_PASSWORD}
     ports:
-      - 8080:80 
-  colosseum-etcd:
+      - 8080:80       
+  cloudiator-service:
     depends_on:
-      - "colosseum-service"
-    image: microbox/etcd:latest
-    command: -name=colosseum-etcd
+      - "cloudiator-store"
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/mowgli-colosseum:latest
     restart: always
+    environment:
+      - MYSQL_USER=${DATABASE_USER}
+      - MYSQL_PW=${DATABASE_PASSWORD}
+      - MYSQL_DB=${DATABASE_DB}
+      - MYSQL_HOST=cloudiator-store
+      - ETCD_HOST=cloudiator-etcd
     ports:
-      - 4001:4001
-      - 7001:7001
-  application-catalogue:
+      - 9000:9000
+#    volumes:
+#      - /var/log/db-evaluator-colosseum:/opt/docker-init/logs
+  cloudiator-etcd:
     depends_on:
-      - "colosseum-service"
-    image: omi-registry.e-technik.uni-ulm.de/dbms-jungle-explorer/dbms-catalogue:latest
+      - "cloudiator-service"
+    image: microbox/etcd:latest
+    command: -name=cloudiator-etcd
     restart: always
-    environment:
-      - COLOSSEUM_URI=colosseum-service
-      - SCRIPT_DOWNLOAD_ENDPOINT=${SCRIPT_DOWNLOAD_ENDPOINT}
     ports:
-      - 9091:9091
-    volumes:
-      - /var/log/application-deployment-library:/var/log/db-evaluator/    
+      - 4001:4001
+      - 7001:7001
+####### Monitoring and management components #########      
+  
   influxdb-store:
     image: influxdb:1.5.3
     restart: always
@@ -84,28 +76,42 @@ services:
  #     - INFLUXDB_PASSWORD=${INFLUXDB_PW}
     ports:
       - 8888:8888
+  portainer:
+    image: portainer/portainer
+    ports:
+      - "9001:9000"
+    command: -H unix:///var/run/docker.sock --admin-password-file /app/portainer.conf
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /opt/portainer/data:/data  
+      - $PWD:/app        
+
+####### Mowgli components #########            
   evaluation-orchestrator:
     depends_on:
       - "application-catalogue"
-    image: omi-registry.e-technik.uni-ulm.de/dbms-jungle-explorer/evaluation-orchestrator:latest
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/evaluation-orchestrator:latest
     restart: always
     environment:
-      - COLOSSEUM_URI=colosseum-service
+      - COLOSSEUM_URI=cloudiator-service
       - APPLICATION_DEPLOYMENT_LIBRARY_URI=application-catalogue
       - WORKLOAD_API_URI=${WORKLOAD_API_IP}
       - INFLUXDB_URL=${PUBLIC_IP}:8086
     ports:
       - 8282:8282
     volumes:
-      - /var/log/evaluation-orchestrator/:/var/log/evaluation-orchestrator/ 
+#      - /var/log/evaluation-orchestrator/:/var/log/evaluation-orchestrator/ 
       - /opt/evaluation-results/:/opt/evaluation-results/  
-  portainer:
-    image: portainer/portainer
+  application-catalogue:
+    depends_on:
+      - "cloudiator-service"
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/dbms-catalogue:latest
+    restart: always
+    environment:
+      - COLOSSEUM_URI=cloudiator-service
+      - SCRIPT_DOWNLOAD_ENDPOINT=${SCRIPT_DOWNLOAD_ENDPOINT}
     ports:
-      - "9001:9000"
-    command: -H unix:///var/run/docker.sock --admin-password-file /app/portainer.conf
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /opt/portainer/data:/data  
-      - $PWD:/app        
-      
\ No newline at end of file
+      - 9091:9091
+  #  volumes:
+  #    - /var/log/application-deployment-library:/var/log/db-evaluator/          
+  
\ No newline at end of file
-- 
GitLab