general improvement*

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3"
+version: "3.7"
 
 services:
   postgres:
@@ -15,11 +15,12 @@ services:
       - "5432:5432"
     networks:
       - app-network
+    restart: unless-stopped
+
   keycloak:
     image: in-sylva.keycloak:latest
     container_name: in-sylva.keycloak
     environment:
-      PROXY_ADDRESS_FORWARDING: "true"
       DB_VENDOR: POSTGRES
       DB_ADDR: postgres
       DB_DATABASE: keycloak
@@ -36,7 +37,7 @@ services:
       - postgres
     networks:
       - app-network
-    restart: on-failure
+    restart: unless-stopped
 
   pgadmin:
     image: dpage/pgadmin4
@@ -226,13 +227,13 @@ services:
     image: in-sylva.portal:latest
     container_name: in-sylva.portal
     environment:
-      - network.host=0.0.0.0
-      - REACT_APP_IN_SYLVA_GATEKEEPER_HOST=http://in-sylva.gatekeeper 
-      - REACT_APP_IN_SYLVA_GATEKEEPER_PORT=4000 
-      - REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=http://in-sylva.source.manager
-      - REACT_APP_IN_SYLVA_SOURCE_MANAGER_PORT=5000
-      - REACT_APP_IN_SYLVA_KEYCLOAK_HOST=http://in-sylva.keycloak
-      - REACT_APP_IN_SYLVA_KEYCLOAK_PORT=7000
+      network.host: 0.0.0.0
+      REACT_APP_IN_SYLVA_GATEKEEPER_HOST: http://in-sylva.gatekeeper 
+      REACT_APP_IN_SYLVA_GATEKEEPER_PORT: 4000 
+      REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST: http://in-sylva.source.manager
+      REACT_APP_IN_SYLVA_SOURCE_MANAGER_PORT: 5000
+      REACT_APP_IN_SYLVA_KEYCLOAK_HOST: http://in-sylva.keycloak
+      REACT_APP_IN_SYLVA_KEYCLOAK_PORT: 7000
     ports:
       - 3000:3000
     links: 
@@ -278,6 +279,7 @@ volumes:
   odfe-data1:
   odfe-data2:
   portainer_data:
+
 networks:
   app-network:
     driver: bridge

keycloak/Dockerfile

@@ -1,15 +1,16 @@
 FROM registry.access.redhat.com/ubi8-minimal
 
-ENV KEYCLOAK_VERSION 8.0.0
+ENV KEYCLOAK_VERSION 9.0.0
 ENV JDBC_POSTGRES_VERSION 42.2.5
 ENV JDBC_MYSQL_VERSION 5.1.46
 ENV JDBC_MARIADB_VERSION 2.2.3
 ENV JDBC_MSSQL_VERSION 7.4.1.jre11
 
 ENV LAUNCH_JBOSS_IN_BACKGROUND 1
-ENV PROXY_ADDRESS_FORWARDING false
+ENV PROXY_ADDRESS_FORWARDING true
 ENV JBOSS_HOME /opt/jboss/keycloak
 ENV LANG en_US.UTF-8
+ENV network.host=0.0.0.0
 
 ARG GIT_REPO
 ARG GIT_BRANCH

login/build.sh

@@ -7,6 +7,6 @@
     shift
 done
 
-docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.user.login .
+docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.user.login .
 
 

portal/Dockerfile

@@ -42,6 +42,8 @@ FROM nginx:latest
 
 RUN apt-get update && apt-get install wget -y
 
+RUN apt-get install iputils-ping -y
+
 RUN apt-get update && apt-get install nginx-extras -y
 
 ARG REACT_APP_IN_SYLVA_GATEKEEPER_HOST

portal/nginx/nginx.conf

@@ -49,8 +49,8 @@ server {
 
   location /keycloak/auth/ {
       proxy_pass          http://backend_keycloak/keycloak/auth/;
-      proxy_set_header    Host               $host;
 
+      proxy_set_header    Host               $host;
       proxy_set_header    X-Real-IP          $remote_addr;
       proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
       proxy_set_header    X-Forwarded-Host   $host;