From 262f422ce5877a574ed1bd9cc8be97676ad27eb4 Mon Sep 17 00:00:00 2001
From: Florent MILLOT <millotflo@gmail.com>
Date: Mon, 18 Sep 2023 10:40:33 +0200
Subject: [PATCH] Remove the gridexplore service

Signed-off-by: Florent MILLOT <millotflo@gmail.com>
---
 README.md                                            |  2 +-
 docker-compose/apps-metadata.json                    |  2 +-
 docker-compose/docker-compose.base.yml               |  6 +++---
 docker-compose/study/docker-compose.override.yml     | 12 +-----------
 .../study/gridexplore-app-idpSettings.json           |  8 --------
 docker-compose/study/gridstudy-app-idpSettings.json  |  6 +++---
 6 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 docker-compose/study/gridexplore-app-idpSettings.json

diff --git a/README.md b/README.md
index 9fde911d..e526b5b4 100644
--- a/README.md
+++ b/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:
diff --git a/docker-compose/apps-metadata.json b/docker-compose/apps-metadata.json
index 7472763d..47427b5c 100644
--- a/docker-compose/apps-metadata.json
+++ b/docker-compose/apps-metadata.json
@@ -7,7 +7,7 @@
 },
 {
   "name" : "Study",
-  "url"  : "http://localhost:84",
+  "url"  : "http://localhost:80",
   "appColor" : "#0CA789",
   "hiddenInAppsMenu" : true,
   "resources" : [
diff --git a/docker-compose/docker-compose.base.yml b/docker-compose/docker-compose.base.yml
index 2794ba98..24f610a4 100644
--- a/docker-compose/docker-compose.base.yml
+++ b/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
diff --git a/docker-compose/study/docker-compose.override.yml b/docker-compose/study/docker-compose.override.yml
index 8797da03..c6b3fb44 100644
--- a/docker-compose/study/docker-compose.override.yml
+++ b/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:
diff --git a/docker-compose/study/gridexplore-app-idpSettings.json b/docker-compose/study/gridexplore-app-idpSettings.json
deleted file mode 100644
index 9e83f8e5..00000000
--- a/docker-compose/study/gridexplore-app-idpSettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "authority" : "http://172.17.0.1:9090/",
-    "client_id" : "gridexplore-client",
-    "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"
-}
diff --git a/docker-compose/study/gridstudy-app-idpSettings.json b/docker-compose/study/gridstudy-app-idpSettings.json
index adb21f15..3d1f802b 100644
--- a/docker-compose/study/gridstudy-app-idpSettings.json
+++ b/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"
 }