Fix keycloak example + improve CI build to catch a similar issue next…

… time (#161)
strimzi · Oct 3, 2022 · fe8bd55 · fe8bd55
1 parent 6b9d537
commit fe8bd55
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 15 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -55,9 +55,9 @@ if [ "${MAIN_BUILD}" == "TRUE" ] ; then
     # Build s390x compatible hydra image
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/s390x-linux-gnu/jni
     docker build --target hydra-import -t strimzi-oauth-testsuite/hydra-import:latest -f ./testsuite/docker/hydra-import/Dockerfile.s390x .
-    git clone -b 19.0.1 https://github.com/keycloak/keycloak-containers.git
+    git clone -b 19.0.2 https://github.com/keycloak/keycloak-containers.git
     cd keycloak-containers/server/
-    docker build -t quay.io/keycloak/keycloak:19.0.1-legacy .
+    docker build -t quay.io/keycloak/keycloak:19.0.2-legacy .
     cd ../../ && rm -rf keycloak-containers
     docker build --target oryd-hydra -t oryd/hydra:v1.8.5 -f ./testsuite/docker/hydra-import/Dockerfile.s390x .
     mvn test-compile spotbugs:check -e -V -B -f testsuite
@@ -94,6 +94,11 @@ if [ "${MAIN_BUILD}" == "TRUE" ] ; then
 
     set -e
   fi
+
+  # Test example image build for keycloak-ssl example
+  cd examples/docker
+  docker-compose -f compose.yml -f keycloak/compose-ssl.yml build
+  cd ../..
 fi
 
 # Push only releases

diff --git a/examples/docker/keycloak-import/Dockerfile b/examples/docker/keycloak-import/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:19.0.1-legacy
+FROM quay.io/keycloak/keycloak:19.0.2-legacy
 
 RUN mkdir /opt/jboss/realms
 COPY realms/* /opt/jboss/realms/

diff --git a/examples/docker/keycloak/Dockerfile b/examples/docker/keycloak/Dockerfile
@@ -1,6 +1,6 @@
-FROM quay.io/keycloak/keycloak:19.0.1-legacy
+FROM quay.io/keycloak/keycloak:19.0.2-legacy
 
-COPY certificates/keycloak.server.keystore.p12 /opt/jboss/keycloak/standalone/configuration/
+COPY certificates/keycloak.server.keystore.p12 /opt/jboss/keycloak/standalone/configuration/keycloak.server.keystore
 COPY keycloak-ssl.cli /opt/jboss/keycloak/
 
 RUN cd /opt/jboss/keycloak && \

diff --git a/examples/docker/keycloak/compose-ssl.yml b/examples/docker/keycloak/compose-ssl.yml
@@ -14,4 +14,4 @@ services:
       KEYCLOAK_PASSWORD: "admin"
       KEYCLOAK_HTTPS_PORT: 8443
       PROXY_ADDRESS_FORWARDING: "true"
-    command: "-Dkeycloak.profile.feature.upload_scripts=enabled"
+    command: "-Dkeycloak.profile.feature.upload_scripts=enabled -b 0.0.0.0"
diff --git a/examples/docker/keycloak/compose.yml b/examples/docker/keycloak/compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
 
   keycloak:
-    image: quay.io/keycloak/keycloak:19.0.1-legacy
+    image: quay.io/keycloak/keycloak:19.0.2-legacy
     container_name: keycloak
     ports:
       -  8080:8080

diff --git a/examples/docker/keycloak/keycloak-ssl.cli b/examples/docker/keycloak/keycloak-ssl.cli
@@ -1,4 +1,5 @@
 embed-server --server-config=standalone-ha.xml
-/core-service=management/security-realm=UndertowRealm:add()
-/core-service=management/security-realm=UndertowRealm/server-identity=ssl:add(keystore-path=keycloak.server.keystore.p12, keystore-relative-to=jboss.server.config.dir, keystore-password=changeit)
-/subsystem=undertow/server=default-server/https-listener=https:write-attribute(name=security-realm, value=UndertowRealm)
+/subsystem=elytron/key-store=kcKeyStore:add(path=keycloak.server.keystore,relative-to=jboss.server.config.dir, credential-reference={clear-text=changeit},type=PKCS12)
+/subsystem=elytron/key-manager=kcKeyManager:add(key-store=kcKeyStore,credential-reference={clear-text=changeit})
+/subsystem=elytron/server-ssl-context=kcSSLContext:add(key-manager=kcKeyManager)
+/subsystem=undertow/server=default-server/https-listener=https:write-attribute(name=ssl-context,value=kcSSLContext)
diff --git a/examples/kubernetes/keycloak-postgres.yaml b/examples/kubernetes/keycloak-postgres.yaml
@@ -27,7 +27,7 @@ metadata:
 spec:
   containers:
   - name: keycloak
-    image: quay.io/keycloak/keycloak:19.0.1-legacy
+    image: quay.io/keycloak/keycloak:19.0.2-legacy
     args:
     - "-b 0.0.0.0"
     - "-Dkeycloak.profile.feature.upload_scripts=enabled"

diff --git a/examples/kubernetes/keycloak.yaml b/examples/kubernetes/keycloak.yaml
@@ -27,7 +27,7 @@ metadata:
 spec:
   containers:
   - name: keycloak
-    image: quay.io/keycloak/keycloak:19.0.1-legacy
+    image: quay.io/keycloak/keycloak:19.0.2-legacy
     args:
     - "-b 0.0.0.0"
     - "-Dkeycloak.profile.feature.upload_scripts=enabled"

diff --git a/testsuite/keycloak-auth-tests/docker-compose.yml b/testsuite/keycloak-auth-tests/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   keycloak:
-    image: quay.io/keycloak/keycloak:19.0.1-legacy
+    image: quay.io/keycloak/keycloak:19.0.2-legacy
     ports:
       - "8080:8080"
     volumes:

diff --git a/testsuite/keycloak-authz-tests/docker-compose.yml b/testsuite/keycloak-authz-tests/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   keycloak:
-    image: quay.io/keycloak/keycloak:19.0.1-legacy
+    image: quay.io/keycloak/keycloak:19.0.2-legacy
     ports:
       - "8080:8080"
       - "8443:8443"

diff --git a/testsuite/keycloak-errors-tests/docker-compose.yml b/testsuite/keycloak-errors-tests/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   keycloak:
-    image: quay.io/keycloak/keycloak:19.0.1-legacy
+    image: quay.io/keycloak/keycloak:19.0.2-legacy
     ports:
       - "8080:8080"
       - "8443:8443"