Revert "revert changes to the old docker-compose.yml"

This reverts commit a540507.
RADAR-base · Nov 22, 2023 · 779b35b · 779b35b
1 parent a540507
commit 779b35b
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/integrationTest/resources/docker/docker-compose.yml b/src/integrationTest/resources/docker/docker-compose.yml
@@ -7,6 +7,9 @@ networks:
   admin:
     driver: bridge
     internal: true
+  mp:
+    driver: bridge
+    internal: true
 
 services:
   postgres:
@@ -64,18 +67,33 @@ services:
   # Management Portal                                                         #
   #---------------------------------------------------------------------------#
   managementportal:
-    image: radarbase/management-portal:2.0.0
+#    image: radarbase/management-portal:2.1.0
+    image: managementportal:latest
+    networks:
+      - mp
     ports:
       - "8081:8081"
+    depends_on:
+      - managementportal-postgresql
     environment:
-      SPRING_PROFILES_ACTIVE: dev
-      SERVER_PORT: 8081
-      MANAGEMENTPORTAL_FRONTEND_CLIENT_SECRET: ""
-      MANAGEMENTPORTAL_COMMON_BASE_URL: http://localhost:8081/managementportal
-      MANAGEMENTPORTAL_COMMON_MANAGEMENT_PORTAL_BASE_URL: http://localhost:8081/managementportal
-      MANAGEMENTPORTAL_OAUTH_CLIENTS_FILE: /mp-includes/config/oauth_client_details.csv
-      MANAGEMENTPORTAL_CATALOGUE_SERVER_ENABLE_AUTO_IMPORT: 'false'
-      SERVER_SERVLET_CONTEXT_PATH: /managementportal
-      JAVA_OPTS: -Xmx256m  # maximum heap size for the JVM running ManagementPortal, increase this as necessary
+      - SPRING_PROFILES_ACTIVE=prod,e2e-prod-test
+      - SERVER_PORT=8081
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://managementportal-postgresql:5432/managementportal
+      - SPRING_DATASOURCE_USERNAME=radarbase
+      - SPRING_DATASOURCE_PASSWORD=radarbase
+      - SPRING_LIQUIBASE_CONTEXTS=dev #includes testing_data, remove for production builds
+      - MANAGEMENTPORTAL_FRONTEND_CLIENT_SECRET=
+      - MANAGEMENTPORTAL_OAUTH_CLIENTS_FILE=/mp-includes/config/oauth_client_details.csv
+      - JHIPSTER_SLEEP=10 # gives time for the database to boot before the application
+      - JAVA_OPTS=-Xmx512m  # maximum heap size for the JVM running ManagementPortal, increase this as necessary
     volumes:
       - ./etc/:/mp-includes/
+
+  managementportal-postgresql:
+    image: postgres:11-alpine
+    networks:
+      - mp
+    environment:
+      - POSTGRES_USER=radarbase
+      - POSTGRES_PASSWORD=radarbase
+      - POSTGRES_DB=managementportal