update for relase 4.0.0 of opfab

Signed-off-by: vlo-rte <valerie.longa@rte-france.com>
opfab · Oct 6, 2023 · 583163d · 583163d
1 parent 599826b
commit 583163d
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 134 deletions.
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
@@ -9,31 +9,31 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: password
   rabbitmq:
     container_name: rabbitmq
-    image: rabbitmq:3-management
+    image: lfeoperatorfabric/of-rabbitmq:4.0.0.RELEASE
     ports:
       - "5672:5672"
       - "15672:15672"
   keycloak:
     image: jboss/keycloak:16.1.1
-    command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/realms/export -Dkeycloak.profile.feature.upload_scripts=enabled
+    command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/realms/export -Dkeycloak.profile.feature.upload_scripts=enabled -Djboss.http.port=89
     environment:
     - KEYCLOAK_USER=admin
     - KEYCLOAK_PASSWORD=admin
     - DB_VENDOR=H2
     volumes:
     - ./realms:/realms
     ports:
-    - "89:8080"
+    - "89:89"
     - "90:9990"
   users:
     container_name: users
-    image: "lfeoperatorfabric/of-users-service:3.15.1.RELEASE"
+    image: "lfeoperatorfabric/of-users-service:4.0.0.RELEASE"
     depends_on:
       - mongodb
       - rabbitmq
     user: ${USER_ID}:${USER_GID}
     ports:
-     - "2103:8080"
+     - "2103:2103"
      - "4103:5005"
     environment:
     - REGISTRY_HOST=registry
@@ -42,15 +42,15 @@ services:
     volumes:
       - "../certificates:/certificates_to_add"
       - "./docker-configurations/users.yml:/config/application.yml"
-      - "./docker-configurations/common.yml:/config/common-docker.yml"
+      - "./docker-configurations/common.yml:/config/common.yml"
   businessconfig:
     container_name: businessconfig
-    image: "lfeoperatorfabric/of-businessconfig-service:3.15.1.RELEASE"
+    image: "lfeoperatorfabric/of-businessconfig-service:4.0.0.RELEASE"
     depends_on:
       - mongodb
     user: ${USER_ID}:${USER_GID}
     ports:
-     - "2100:8080"
+     - "2100:2100"
      - "4100:5005"
     environment:
     - REGISTRY_HOST=registry
@@ -59,53 +59,53 @@ services:
     volumes:
       - "../certificates:/certificates_to_add"
       - "./businessconfig-storage:/businessconfig-storage"
-      - "./docker-configurations/common.yml:/config/common-docker.yml"
-      - "./docker-configurations/businessconfig.yml:/config/application-docker.yml"
+      - "./docker-configurations/common.yml:/config/common.yml"
+      - "./docker-configurations/businessconfig.yml:/config/application.yml"
   cards-publication:
     container_name: cards-publication
-    image: "lfeoperatorfabric/of-cards-publication-service:3.15.1.RELEASE"
+    image: "lfeoperatorfabric/of-cards-publication-service:4.0.0.RELEASE"
     depends_on:
       - mongodb
       - rabbitmq
     user: ${USER_ID}:${USER_GID}
     ports:
-     - "2102:8080"
+     - "2102:2102"
      - "4102:5005"
     environment:
     - REGISTRY_HOST=registry
     - REGISTRY_PORT=8080
     - DEPENDS_ON=CONFIG
     volumes:
       - "../certificates:/certificates_to_add"
-      - "./docker-configurations/common.yml:/config/common-docker.yml"
-      - "./docker-configurations/cards-publication.yml:/config/application-docker.yml"
+      - "./docker-configurations/common.yml:/config/common.yml"
+      - "./docker-configurations/cards-publication.yml:/config/application.yml"
   cards-consultation:
     container_name: cards-consultation
-    image: "lfeoperatorfabric/of-cards-consultation-service:3.15.1.RELEASE"
+    image: "lfeoperatorfabric/of-cards-consultation-service:4.0.0.RELEASE"
     depends_on:
       - mongodb
       - rabbitmq
     user: ${USER_ID}:${USER_GID}
     ports:
-     - "2104:8080"
+     - "2104:2104"
      - "4104:5005"
     environment:
     - REGISTRY_HOST=registry
     - REGISTRY_PORT=8080
     - DEPENDS_ON=CONFIG
     volumes:
       - "../certificates:/certificates_to_add"
-      - "./docker-configurations/common.yml:/config/common-docker.yml"
-      - "./docker-configurations/cards-consultation.yml:/config/application-docker.yml"
+      - "./docker-configurations/common.yml:/config/common.yml"
+      - "./docker-configurations/cards-consultation.yml:/config/application.yml"
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:3.15.1.RELEASE"
+    image: "lfeoperatorfabric/of-web-ui:4.0.0.RELEASE"
     ports:
     - "2002:80"
     depends_on:
       - users
       - businessconfig
       - cards-consultation
     volumes:
-      - "./web-ui.json:/usr/share/nginx/html/opfab/web-ui.json"
-      - "./ui-menu.json:/usr/share/nginx/html/opfab/ui-menu.json"
+      - "./web-ui.json:/usr/share/nginx/html/config/web-ui.json"
+      - "./ui-menu.json:/usr/share/nginx/html/config/ui-menu.json"
       - "./nginx.conf:/etc/nginx/conf.d/default.conf"
diff --git a/server/docker-configurations/businessconfig.yml b/server/docker-configurations/businessconfig.yml
@@ -1,8 +1,4 @@
 
-spring:
-  application:
-    name: businessconfig
-
 
 operatorfabric.businessconfig:
   storage:
@@ -11,4 +7,4 @@ operatorfabric.businessconfig:
 #here we put urls for all feign clients
 users:
   ribbon:
-    listOfServers: users:8080
+    listOfServers: users:2103
diff --git a/server/docker-configurations/cards-consultation.yml b/server/docker-configurations/cards-consultation.yml
@@ -1,10 +1,6 @@
 
-spring:
-  application:
-    name: cards-consultation
-
 
 #here we put urls for all feign clients
 users:
   ribbon:
-    listOfServers: users:8080
+    listOfServers: users:2103
diff --git a/server/docker-configurations/cards-publication.yml b/server/docker-configurations/cards-publication.yml
@@ -1,7 +1,5 @@
 
 spring:
-  application:
-    name: cards-publication
   deserializer:
     value:
       delegate:
@@ -17,27 +15,28 @@ spring:
 #    consumer:
 #      group-id: opfab-command
 
-opfab:
-  kafka:
-    topics:
-      card:
-        topicname: opfab
-      response-card:
-        topicname: opfab-response
-    schema:
-      registry:
-        url: http://localhost:8081
 
 #here we put urls for all feign clients
 users:
   ribbon:
-    listOfServers: users:8080
+    listOfServers: users:2103
 
 externalRecipients-url: "{\
           externalRecipient: \"http://ext-app:8090/test\" \
           }"
 
 # WARNING : If you set this parameter to false , all users have the rights to respond to all cards
 checkPerimeterForResponseCard: true
-checkAuthenticationForCardSending: false
-checkPerimeterForCardSending: false
+operatorfabric:
+  cards-publication:
+    checkAuthenticationForCardSending: false
+    checkPerimeterForCardSending: false
+    kafka:
+      topics:
+        card:
+          topicname: opfab
+        response-card:
+          topicname: opfab-response
+      schema:
+        registry:
+          url: http://localhost:8081
diff --git a/server/docker-configurations/common.yml b/server/docker-configurations/common.yml
@@ -4,32 +4,26 @@ management:
     web:
       exposure:
         include: '*'
-spring:
-  rabbitmq:
-    host: rabbitmq
-    port: 5672
-    username: guest
-    password: guest
+
+operatorfabric:
   security:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: http://keycloak:8080/auth/realms/dev/protocol/openid-connect/certs
-  data:
-    mongodb:
-      database: operator-fabric
-      uri: mongodb://root:password@mongodb:27017/operator-fabric?authSource=admin&authMode=scram-sha1
-
-
-operatorfabric:
+          jwk-set-uri: http://keycloak:89/auth/realms/dev/protocol/openid-connect/certs
+          login-claim: preferred_username
+          expire-claim: exp
+      client-id: opfab-client
   servicesUrls:
-    users: "users:8080"
-    businessconfig: "businessconfig:8080"
+    users: "users:2103"
+    businessconfig: "businessconfig:2100"
+  mongodb:
+    uri: mongodb://root:password@mongodb:27017/operator-fabric?authSource=admin
+
+  rabbitmq:
+    host: rabbitmq
+    port: 5672
+    username: guest
+    password: guest
 
-  security:
-    oauth2:
-      client-id: opfab-client
-    jwt:
-      login-claim: preferred_username
-      expire-claim: exp
 
diff --git a/server/docker-configurations/users.yml b/server/docker-configurations/users.yml
@@ -2,10 +2,6 @@
 # !!!! WARNING: VALUES SHOULD BE CHANGED FOR PRODUCTION MODE !!!!
 #
 
-spring:
-  application:
-    name: users
-
 
 operatorfabric.users.default:
   users:

diff --git a/server/nginx.conf b/server/nginx.conf
@@ -5,7 +5,7 @@ server {
   server_name localhost;
   ### CUSTOMIZATION - BEGIN
   # Url of the Authentication provider
-  set $KeycloakBaseUrl "http://keycloak:8080";
+  set $KeycloakBaseUrl "http://keycloak:89";
   # Realm associated to OperatorFabric within the Authentication provider
   set $OperatorFabricRealm "dev";
   # base64 encoded pair of authentication in the form of 'client-id:secret-id'
@@ -38,34 +38,34 @@ server {
     proxy_pass $KeycloakOpenIdConnect/auth?response_type=code&client_id=opfab-client&$args;
   }
   location /config/web-ui.json {
-    alias /usr/share/nginx/html/opfab/web-ui.json;
+    alias /usr/share/nginx/html/config/web-ui.json;
   }
   location /config/ui-menu.json {
-    alias /usr/share/nginx/html/opfab/ui-menu.json;
+    alias /usr/share/nginx/html/config/ui-menu.json;
   }
   location /businessconfig {
     proxy_set_header Host $http_host;
-    proxy_pass http://businessconfig:8080;
+    proxy_pass http://businessconfig:2100;
   }
   location /users {
     proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/users;
+    proxy_pass http://users:2103/users;
   }
   location ~ "^/users/(.*)" {
     proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/$1$is_args$args;
+    proxy_pass http://users:2103/$1$is_args$args;
   }
   location /cards/ {
     proxy_set_header Host $http_host;
-    proxy_pass http://cards-consultation:8080/;
+    proxy_pass http://cards-consultation:2104/;
   }
   location /cardspub/cards/ {
     proxy_set_header Host $http_host;
-    proxy_pass http://cards-publication:8080/cards/;
+    proxy_pass http://cards-publication:2102/cards/;
   }
   location /archives {
     proxy_set_header Host $http_host;
-    proxy_pass http://cards-consultation:8080;
+    proxy_pass http://cards-consultation:2104;
   }
   error_page 500 502 503 504 /50x.html;
   location = /50x.html {