From 70026cebc0fd20b660cafe0bf95d0eea73459de2 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 27 Oct 2020 20:30:09 +0100
Subject: Propagate user-specified API url to React build

This change fixes an issue where we did not forward the environmental
variable for controlling the API url to the React build.
---
 docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index c3e62317..25e7ee8f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,8 @@ services:
     build:
       context: ./frontend
       args:
-        - REACT_APP_OAUTH_CLIENT_ID=${OPENDC_OAUTH_CLIENT_ID}
+        - OPENDC_OAUTH_CLIENT_ID=${OPENDC_OAUTH_CLIENT_ID}
+        - OPENDC_API_BASE_URL=${OPENDC_SERVER_BASE_URL}
     image: frontend
     restart: on-failure
     networks:
-- 
cgit v1.2.3


From 45c3adb6fdfed5c191d8a14562eaabbd54c5c91b Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 27 Oct 2020 23:08:12 +0100
Subject: Split prod and dev config for Docker Compose

This change splits the Docker Compose configuration into three files in
order to share the configuration for different environments (e.g.
development and production).

Furthermore, this change drops the requirement for a reverse proxy.
---
 docker-compose.yml | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 25e7ee8f..4d62b7cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,24 +4,16 @@ services:
     build:
       context: ./frontend
       args:
-        - OPENDC_OAUTH_CLIENT_ID=${OPENDC_OAUTH_CLIENT_ID}
-        - OPENDC_API_BASE_URL=${OPENDC_SERVER_BASE_URL}
+        OPENDC_OAUTH_CLIENT_ID: ${OPENDC_OAUTH_CLIENT_ID}
     image: frontend
     restart: on-failure
     networks:
       - backend
-    depends_on:
-      - api
-    ports:
-      - "8081:80"
 
   api:
     build: ./api
     image: api
     restart: on-failure
-    # Comment out these 2 lines for deployment
-    ports:
-      - "8082:8081"
     networks:
       - backend
     depends_on:
@@ -36,8 +28,6 @@ services:
       - OPENDC_DB_HOST=mongo
       - OPENDC_FLASK_SECRET
       - OPENDC_OAUTH_CLIENT_ID
-      - OPENDC_ROOT_DIR
-      - OPENDC_SERVER_BASE_URL
 
   simulator:
     build: ./simulator
@@ -74,25 +64,9 @@ services:
       - OPENDC_DB_PASSWORD
     networks:
       - backend
-    # Comment out for public deployment
-    ports:
-      - "27017:27017"
     volumes:
       - mongo-volume:/data/db
 
-  mongo-express:
-    image: mongo-express
-    restart: on-failure
-    networks:
-      - backend
-    depends_on:
-      - mongo
-    ports:
-      - "8083:8081"
-    environment:
-      ME_CONFIG_MONGODB_ADMINUSERNAME: "${MONGO_INITDB_ROOT_USERNAME}"
-      ME_CONFIG_MONGODB_ADMINPASSWORD: "${MONGO_INITDB_ROOT_PASSWORD}"
-
 volumes:
   mongo-volume:
   results-volume:
-- 
cgit v1.2.3