From cac980546e15882a232ce234cbde3e0cda693352 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Tue, 30 Jun 2020 17:26:19 +0200
Subject: Get Docker setup working

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

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 3f4ad20a..bc2b2e25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,78 +7,73 @@ services:
     ports:
       - "8081:8081"
     links:
-      - mariadb
+      - mongo
     depends_on:
-      - mariadb
+      - mongo
     environment:
-      - MYSQL_DATABASE=opendc
-      - MYSQL_USER=opendc
-      - MYSQL_PASSWORD=opendcpassword
-      - MONGO_DB=opendc
-      - MONGO_DB_USERNAME=opendc
-      - MONGO_DB_PASSWORD=opendcpassword
-      - MONGO_DB_HOST=mongo
-      - MONGO_DB_PORT=27017
+      - MONGO_INITDB_ROOT_USERNAME
+      - MONGO_INITDB_ROOT_PASSWORD
+      - MONGO_INITDB_DATABASE
+      - OPENDC_DB
+      - OPENDC_DB_USERNAME
+      - OPENDC_DB_PASSWORD
+      - OPENDC_FLASK_SECRET
+      - OPENDC_OAUTH_CLIENT_ID
+      - OPENDC_ROOT_DIR
+      - OPENDC_SERVER_BASE_URL
+
+# TODO: Implement new database interaction on the simulator side
+#  simulator:
+#    build:
+#        context: ./opendc-simulator
+#        dockerfile: opendc-model-odc/setup/Dockerfile
+#    image: simulator
+#    restart: on-failure
+#    links:
+#      - mongo
+#    depends_on:
+#      - mongo
+#    environment:
+#      - PERSISTENCE_URL=jdbc:mysql://mariadb:3306/opendc
+#      - PERSISTENCE_USER=opendc
+#      - PERSISTENCE_PASSWORD=opendcpassword
+#      - COLLECT_MACHINE_STATES=ON
+#      - COLLECT_TASK_STATES=ON
+#      - COLLECT_STAGE_MEASUREMENTS=OFF
+#      - COLLECT_TASK_METRICS=OFF
+#      - COLLECT_JOB_METRICS=OFF
 
-  simulator:
-    build:
-        context: ./opendc-simulator
-        dockerfile: opendc-model-odc/setup/Dockerfile
-    image: simulator
-    restart: on-failure
-    links:
-      - mariadb
-    depends_on:
-      - mariadb
-    environment:
-      - PERSISTENCE_URL=jdbc:mysql://mariadb:3306/opendc
-      - PERSISTENCE_USER=opendc
-      - PERSISTENCE_PASSWORD=opendcpassword
-      - COLLECT_MACHINE_STATES=ON
-      - COLLECT_TASK_STATES=ON
-      - COLLECT_STAGE_MEASUREMENTS=OFF
-      - COLLECT_TASK_METRICS=OFF
-      - COLLECT_JOB_METRICS=OFF
-  mariadb:
-    build:
-        context: ./database
-    image: database
-    restart: on-failure
-    ports:
-      - "3306:3306" # comment this line out in production
-    environment:
-      - MYSQL_DATABASE=opendc
-      - MYSQL_USER=opendc
-      - MYSQL_PASSWORD=opendcpassword
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-    # uncomment in production
-    # volumes:
-    #   - "/data/mariadb:/var/lib/mysql"
   mongo:
     build:
         context: ./mongodb
     restart: on-failure
     environment:
-      - MONGO_INITDB_ROOT_USERNAME=root
-      - MONGO_INITDB_ROOT_PASSWORD=rootpassword
-      - MONGO_INITDB_DATABASE=admin
-      - OPENDC_DB=opendc
-      - OPENDC_DB_USERNAME=opendc
-      - OPENDC_DB_PASSWORD=opendcpassword
+      - MONGO_INITDB_ROOT_USERNAME
+      - MONGO_INITDB_ROOT_PASSWORD
+      - MONGO_INITDB_DATABASE
+      - OPENDC_DB
+      - OPENDC_DB_USERNAME
+      - OPENDC_DB_PASSWORD
+    # Comment out for public deployment
     ports:
       - 27017:27017
+    # Uncomment for persistent deployment
     #volumes:
     #  - mongo-volume:/data/db
 
   mongo-express:
     image: mongo-express
     restart: on-failure
+    links:
+        - mongo
+    depends_on:
+        - mongo
     ports:
       - 8082:8081
     environment:
-      ME_CONFIG_MONGODB_ADMINUSERNAME: root
-      ME_CONFIG_MONGODB_ADMINPASSWORD: rootpassword
+      ME_CONFIG_MONGODB_ADMINUSERNAME: "${MONGO_INITDB_ROOT_USERNAME}"
+      ME_CONFIG_MONGODB_ADMINPASSWORD: "${MONGO_INITDB_ROOT_PASSWORD}"
 
 volumes:
     mongo-volume:
-        external: false
\ No newline at end of file
+        external: false
-- 
cgit v1.2.3