From 77d7ffd9a7a33f08109a2db8a35e4094b2761c51 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 17 Mar 2022 11:34:55 +0100
Subject: refactor(web): Update Docker deployment for new web API

This change updates the Docker deployment configuration for the new web
API implemented in Kotlin. The new API migrates to Postgres.
Furthermore, with this change, we move the Dockerfiles to their
corresponding module.
---
 docker-compose.yml | 52 ++++++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 52209a5b..faaecc03 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,23 +19,16 @@ services:
     networks:
       - backend
     depends_on:
-      - mongo
+      - postgres
     environment:
-      - MONGO_INITDB_ROOT_USERNAME
-      - MONGO_INITDB_ROOT_PASSWORD
-      - MONGO_INITDB_DATABASE
-      - OPENDC_DB
-      - OPENDC_DB_USERNAME
-      - OPENDC_DB_PASSWORD
-      - OPENDC_DB_HOST=mongo
-      - OPENDC_FLASK_SECRET
-      - AUTH0_DOMAIN=${OPENDC_AUTH0_DOMAIN}
-      - AUTH0_AUDIENCE=${OPENDC_AUTH0_AUDIENCE}
-      - AUTH0_DOCS_CLIENT_ID=${OPENDC_AUTH0_DOCS_CLIENT_ID}
-      - SENTRY_DSN=${OPENDC_API_SENTRY_DSN-}
-      - SENTRY_ENVIRONMENT
+      OPENDC_DB_USERNAME: ${OPENDC_DB_USERNAME:?No database username specified}
+      OPENDC_DB_PASSWORD: ${OPENDC_DB_PASSWORD:?No database password specified}
+      OPENDC_DB_URL: jdbc:postgresql://postgres:5432/opendc
+      OPENDC_AUTH0_DOMAIN: ${OPENDC_AUTH0_DOMAIN:?No Auth0 domain specified}
+      OPENDC_AUTH0_AUDIENCE: ${OPENDC_AUTH0_AUDIENCE:?No Auth0 audience specified}
+      SENTRY_DSN: ${OPENDC_API_SENTRY_DSN-}
 
-  simulator:
+  runner:
     image: atlargeresearch/opendc:v2.1
     restart: on-failure
     networks:
@@ -47,31 +40,26 @@ services:
         source: ./traces
         target: /opt/opendc/traces
     environment:
-     - OPENDC_API_URL=${OPENDC_API_BASE_URL}
-     - AUTH0_DOMAIN=${OPENDC_AUTH0_DOMAIN}
-     - AUTH0_AUDIENCE=${OPENDC_AUTH0_AUDIENCE}
-     - AUTH0_CLIENT_ID=${OPENDC_AUTH0_CLIENT_ID_RUNNER}
-     - AUTH0_CLIENT_SECRET=${OPENDC_AUTH0_CLIENT_SECRET_RUNNER}
-     - SENTRY_DSN=${OPENDC_SIMULATOR_SENTRY_DSN-}
-     - SENTRY_ENVIRONMENT
+      OPENDC_API_URL: ${OPENDC_API_BASE_URL:-http://web:8080}
+      AUTH0_DOMAIN: ${OPENDC_AUTH0_DOMAIN:?No Auth0 domain specified}
+      AUTH0_AUDIENCE: ${OPENDC_AUTH0_AUDIENCE:?No Auth0 audience specified}
+      AUTH0_CLIENT_ID: ${OPENDC_AUTH0_CLIENT_ID_RUNNER:?No client id for runner}
+      AUTH0_CLIENT_SECRET: ${OPENDC_AUTH0_CLIENT_SECRET_RUNNER:?No client secret for runner}
+      SENTRY_DSN: ${OPENDC_SIMULATOR_SENTRY_DSN-}
 
-  mongo:
-    build: database
+  postgres:
+    image: postgres
     restart: on-failure
     environment:
-      - MONGO_INITDB_ROOT_USERNAME
-      - MONGO_INITDB_ROOT_PASSWORD
-      - MONGO_INITDB_DATABASE
-      - OPENDC_DB
-      - OPENDC_DB_USERNAME
-      - OPENDC_DB_PASSWORD
+      POSTGRES_USER: ${OPENDC_DB_USERNAME}
+      POSTGRES_PASSWORD: ${OPENDC_DB_PASSWORD}
     networks:
       - backend
     volumes:
-      - mongo-volume:/data/db
+      - postgres:/var/lib/postgresql/data
 
 volumes:
-  mongo-volume:
+  postgres:
 
 networks:
   backend: {}
-- 
cgit v1.2.3