[WIP] Remove the gridexplore-app service

README.md

@@ -112,7 +112,7 @@ Applications:
 http://localhost:80 // gridexplore
 http://localhost:81 // gridmerge
 http://localhost:83 // griddyna
-http://localhost:84 // gridstudy
+http://localhost:80 // gridstudy
 ```
 
 Swagger UI:

docker-compose/apps-metadata.json

@@ -7,7 +7,7 @@
 },
 {
   "name" : "Study",
-  "url"  : "http://localhost:84",
+  "url"  : "http://localhost:80",
   "appColor" : "#0CA789",
   "hiddenInAppsMenu" : true,
   "resources" : [

docker-compose/docker-compose.base.yml

@@ -212,9 +212,9 @@ services:
       - CLIENT_LOGOUT_REDIRECT_URI_4=http://localhost:83/logout-callback
       - CLIENT_SILENT_REDIRECT_URI_4=http://localhost:83/silent-renew-callback
       - CLIENT_ID_5=gridstudy-client
-      - CLIENT_REDIRECT_URI_5=http://localhost:84/sign-in-callback
-      - CLIENT_LOGOUT_REDIRECT_URI_5=http://localhost:84/logout-callback
-      - CLIENT_SILENT_REDIRECT_URI_5=http://localhost:84/silent-renew-callback
+      - CLIENT_REDIRECT_URI_5=http://localhost:80/sign-in-callback
+      - CLIENT_LOGOUT_REDIRECT_URI_5=http://localhost:80/logout-callback
+      - CLIENT_SILENT_REDIRECT_URI_5=http://localhost:80/silent-renew-callback
       - ISSUER_HOST=172.17.0.1:9090
     depends_on:
       - logspout

docker-compose/study/docker-compose.override.yml

@@ -159,7 +159,7 @@ services:
   gridstudy-app:
     image: gridsuite/gridstudy-app:latest
     ports:
-      - 84:8080
+      - 80:8080
     volumes:
       - $PWD/../study/gridstudy-app-idpSettings.json:/opt/bitnami/apache/htdocs/gridstudy/idpSettings.json:Z
       - $PWD/../env.json:/opt/bitnami/apache/htdocs/gridstudy/env.json:Z
@@ -218,16 +218,6 @@ services:
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
 
-  gridexplore-app:
-    image: gridsuite/gridexplore-app:latest
-    ports:
-      - 80:8080
-    volumes:
-      - $PWD/../study/gridexplore-app-idpSettings.json:/opt/bitnami/apache/htdocs/gridexplore/idpSettings.json:Z
-      - $PWD/../env.json:/opt/bitnami/apache/htdocs/gridexplore/env.json:Z
-    depends_on:
-      - logspout
-
   explore-server:
     image: gridsuite/explore-server:latest
     ports:

docker-compose/study/gridstudy-app-idpSettings.json

@@ -1,8 +1,8 @@
 {
     "authority" : "http://172.17.0.1:9090/",
     "client_id" : "gridstudy-client",
-    "redirect_uri": "http://localhost:84/sign-in-callback",
-    "post_logout_redirect_uri" : "http://localhost:84/logout-callback",
-    "silent_redirect_uri" : "http://localhost:84/silent-renew-callback",
+    "redirect_uri": "http://localhost:80/sign-in-callback",
+    "post_logout_redirect_uri" : "http://localhost:80/logout-callback",
+    "silent_redirect_uri" : "http://localhost:80/silent-renew-callback",
     "scope" : "openid"
 }