From ff3746899546bde427616c9325220075b6057a07 Mon Sep 17 00:00:00 2001 From: JF Denise Date: Wed, 3 Aug 2022 12:43:27 +0200 Subject: [PATCH 1/5] Upgrade to wildfly-cekit-modules 0.27.7 --- builder-image/image.yaml | 2 +- runtime-image/image.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder-image/image.yaml b/builder-image/image.yaml index 206b142..4a872f6 100644 --- a/builder-image/image.yaml +++ b/builder-image/image.yaml @@ -59,7 +59,7 @@ modules: - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules - ref: 0.27.5 + ref: 0.27.7 - name: eap-modules path: ../modules install: diff --git a/runtime-image/image.yaml b/runtime-image/image.yaml index c930e19..f965fb9 100644 --- a/runtime-image/image.yaml +++ b/runtime-image/image.yaml @@ -48,7 +48,7 @@ modules: - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules - ref: 0.27.5 + ref: 0.27.7 - name: eap-modules path: ../modules install: From 25ff4ce5d26054dda9aed223bd9b1d4a9a7c2717 Mon Sep 17 00:00:00 2001 From: JF Denise Date: Wed, 3 Aug 2022 12:44:17 +0200 Subject: [PATCH 2/5] Upgrade eap maven plugin version to 1.0.0.Beta2-redhat-00001 --- builder-image/image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder-image/image.yaml b/builder-image/image.yaml index 4a872f6..ad2f3e6 100644 --- a/builder-image/image.yaml +++ b/builder-image/image.yaml @@ -45,7 +45,7 @@ envs: value: org.jboss.eap.plugins # TODO To be replaced with actual productized plugin version - name: PROVISIONING_MAVEN_PLUGIN_VERSION - value: 1.0.0.Alpha3-redhat-00001 + value: 1.0.0.Beta2-redhat-00001 - name: SSO_DEFAULT_PROVIDER_NAME value: rh-sso ports: From 9fd3fcb3ec252584c32aeafb02a970f6082854ff Mon Sep 17 00:00:00 2001 From: JF Denise Date: Tue, 23 Aug 2022 14:08:57 +0200 Subject: [PATCH 3/5] Fix for JBEAP-23916, jdk17 image has openjdk11 in IMAGE_NAME env var --- builder-image/image-jdk17-overrides.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builder-image/image-jdk17-overrides.yaml b/builder-image/image-jdk17-overrides.yaml index 2e83768..a138de0 100644 --- a/builder-image/image-jdk17-overrides.yaml +++ b/builder-image/image-jdk17-overrides.yaml @@ -8,6 +8,11 @@ labels: value: "jboss-eap8-beta-openjdk17-builder-openshift-container" - name: name value: *imgName + +envs: + - name: IMAGE_NAME + value: *imgName + modules: install: - name: jboss.container.openjdk.jdk From e934519112f1247b71e1e3db1f2c08110b151352 Mon Sep 17 00:00:00 2001 From: JF Denise Date: Tue, 23 Aug 2022 14:09:22 +0200 Subject: [PATCH 4/5] Upgrade to wildfly-cekit-modules 0.27.9 --- builder-image/image.yaml | 2 +- runtime-image/image.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder-image/image.yaml b/builder-image/image.yaml index ad2f3e6..fb81623 100644 --- a/builder-image/image.yaml +++ b/builder-image/image.yaml @@ -59,7 +59,7 @@ modules: - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules - ref: 0.27.7 + ref: 0.27.9 - name: eap-modules path: ../modules install: diff --git a/runtime-image/image.yaml b/runtime-image/image.yaml index f965fb9..c38a16d 100644 --- a/runtime-image/image.yaml +++ b/runtime-image/image.yaml @@ -48,7 +48,7 @@ modules: - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules - ref: 0.27.7 + ref: 0.27.9 - name: eap-modules path: ../modules install: From 1f3ab70a675032351f78b3476ed14877acf21e20 Mon Sep 17 00:00:00 2001 From: JF Denise Date: Tue, 23 Aug 2022 14:49:47 +0200 Subject: [PATCH 5/5] Use eap maven-plugin 1.0.0.Beta3-redhat-00001 --- builder-image/image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder-image/image.yaml b/builder-image/image.yaml index fb81623..676a5b8 100644 --- a/builder-image/image.yaml +++ b/builder-image/image.yaml @@ -45,7 +45,7 @@ envs: value: org.jboss.eap.plugins # TODO To be replaced with actual productized plugin version - name: PROVISIONING_MAVEN_PLUGIN_VERSION - value: 1.0.0.Beta2-redhat-00001 + value: 1.0.0.Beta3-redhat-00001 - name: SSO_DEFAULT_PROVIDER_NAME value: rh-sso ports: