From 7f1ce8b1929674a73487290abab9540803f87af7 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 17 Feb 2022 15:19:34 +0100
Subject: ci: Fix API deployment using Docker Compose

This change updates the Docker Compose configuration to properly deploy
the API server, by passing the necessary Auth0 information to it.
---
 database/Dockerfile                        | 4 ++--
 docker-compose.override.yml                | 3 +--
 docker-compose.yml                         | 8 ++++++--
 opendc-web/opendc-web-api/requirements.txt | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/database/Dockerfile b/database/Dockerfile
index af3a8382..e4978da6 100644
--- a/database/Dockerfile
+++ b/database/Dockerfile
@@ -1,5 +1,5 @@
-FROM mongo:4.2.8
-MAINTAINER Jacob Burley <j.burley@vu.nl>
+FROM mongo:5.0
+MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com>
 
 # Import init scripts
 ADD mongo-init-opendc-db.sh /docker-entrypoint-initdb.d
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 6202e299..5d104557 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -35,5 +35,4 @@ services:
     ports:
       - "8082:8081"
     environment:
-      ME_CONFIG_MONGODB_ADMINUSERNAME: "${MONGO_INITDB_ROOT_USERNAME}"
-      ME_CONFIG_MONGODB_ADMINPASSWORD: "${MONGO_INITDB_ROOT_PASSWORD}"
+      ME_CONFIG_MONGODB_URL: "mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongo:27017/"
diff --git a/docker-compose.yml b/docker-compose.yml
index 18847736..52209a5b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,8 @@ services:
     restart: on-failure
     networks:
       - backend
+    depends_on:
+      - api
     environment:
       NEXT_PUBLIC_AUTH0_DOMAIN: ${OPENDC_AUTH0_DOMAIN}
       NEXT_PUBLIC_AUTH0_CLIENT_ID: ${OPENDC_AUTH0_CLIENT_ID}
@@ -27,7 +29,9 @@ services:
       - OPENDC_DB_PASSWORD
       - OPENDC_DB_HOST=mongo
       - OPENDC_FLASK_SECRET
-      - OPENDC_OAUTH_CLIENT_ID
+      - 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
 
@@ -37,7 +41,7 @@ services:
     networks:
       - backend
     depends_on:
-      - mongo
+      - api
     volumes:
       - type: bind
         source: ./traces
diff --git a/opendc-web/opendc-web-api/requirements.txt b/opendc-web/opendc-web-api/requirements.txt
index 45eae12b..6f3b42aa 100644
--- a/opendc-web/opendc-web-api/requirements.txt
+++ b/opendc-web/opendc-web-api/requirements.txt
@@ -11,7 +11,6 @@ Flask-Cors==3.0.9
 Flask-SocketIO==4.3.1
 flask-swagger-ui==3.36.0
 Flask-Restful==0.3.8
-greenlet==0.4.17
 httplib2==0.19.0
 isort==4.3.21
 itsdangerous==1.1.0
-- 
cgit v1.2.3