From ab60d539ac22444eb676b17778f07debcb6abef6 Mon Sep 17 00:00:00 2001
From: Andrea Ceccanti <andrea.ceccanti@gmail.com>
Date: Wed, 24 Nov 2021 16:40:46 +0100
Subject: [PATCH] Fix compose so that test-client works fine

---
 docker-compose.yml        | 16 ++++++----------
 iam-login-service/pom.xml | 10 +---------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fe3796208..bd5f4fbeb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,8 +15,8 @@ services:
 
   db:
     image: ${DB_IMAGE}
-      # volumes:
-      #  - db_data:/var/lib/mysql
+    volumes:
+      - db_data:/var/lib/mysql
 
     # The setting below enables custom configuration
     # that turns on the MySQL query log
@@ -35,8 +35,6 @@ services:
 
   trust:
     image: indigoiam/trustanchors
-    # build:
-    #  context: ./docker/trust-anchors
     command: /bin/true
     volumes:
       - trust:/etc/grid-security/certificates
@@ -59,7 +57,7 @@ services:
       IAM_HOST: iam.local.io
       IAM_BASE_URL: https://iam.local.io
       IAM_ISSUER: https://iam.local.io/
-      IAM_USE_FORWARDED_HEADERS: "true"
+      IAM_FORWARD_HEADERS_STRATEGY: native
       IAM_NOTIFICATION_DISABLE: "true"
 
       IAM_DB_HOST: db
@@ -94,8 +92,7 @@ services:
       - logs:/var/log/iam
       - .:/code:ro
       - /dev/urandom:/dev/random
-      - ./compose/custom-logging/logback-spring.xml:/indigo-iam/logback-spring.xml:ro
-
+        # - ./compose/custom-logging/logback-spring.xml:/indigo-iam/logback-spring.xml:ro
         # - ./compose/metadata/iam.local.io.metadata.xml:/indigo-iam/iam.local.io.metadata.xml:ro
         # - ./compose/metadata/spid-idp.example.metadata.xml:/indigo-iam/spid-idp.example.metadata.xml:ro
         # - ./compose/custom-saml/application-saml.yml:/indigo-iam/config/application-saml.yml:ro
@@ -112,11 +109,10 @@ services:
       TZ: Europe/Rome
       IAM_CLIENT_PORT: 8080
       IAM_CLIENT_JAVA_OPTS: -Djava.security.egd=file:/dev/./urandom -Xdebug -Xrunjdwp:server=y,transport=dt_socket,suspend=n,address=1045
-      IAM_CLIENT_ID: client
-      IAM_CLIENT_SECRET: secret
       IAM_CLIENT_ISSUER: https://iam.local.io/
       IAM_CLIENT_REDIRECT_URIS: https://iam.local.io/iam-test-client/openid_connect_login
-      IAM_CLIENT_USE_FORWARD_HEADERS: "true"
+      IAM_FORWARD_HEADERS_STRATEGY: native
+      IAM_CLIENT_TLS_USE_GRID_TRUST_ANCHORS: "true"
       #IAM_CLIENT_EXT_AUTHN_HINT: saml:exampleIdp
       IAM_CLIENT_JAR: /code/iam-test-client/target/iam-test-client.jar
 
diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
index 16d0a5aeb..54cd4419d 100644
--- a/iam-login-service/pom.xml
+++ b/iam-login-service/pom.xml
@@ -450,15 +450,7 @@
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
         <configuration>
-          <to>
-            <image>indigoiam/iam-login-service</image>
-            <tags>
-              <tag>${project.version}</tag>
-              <tag>latest</tag>
-              <tag>${git.commit.id.abbrev}</tag>
-              <tag>${git.branch}</tag>
-            </tags>
-          </to>
+          <skip>true</skip>
         </configuration>
       </plugin>
     </plugins>