Skip to content

Commit 33adc67

Browse files
kie-issues#1285: Remove unnecessary base image from quarkus examples (quay.io/kiegroup/kogito-runtime-jvm:latest) (#2457)
Co-authored-by: Tiago Bento <1584568+tiagobento@users.noreply.github.com>
1 parent e7f0382 commit 33adc67

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

examples/sonataflow-greeting-quarkus-example/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ quarkus.native.native-image-xmx=8g
2828
%container.quarkus.container-image.registry=dev.local
2929
%container.quarkus.container-image.tag=1.0-SNAPSHOT
3030
%container.quarkus.jib.jvm-entrypoint=/home/kogito/kogito-app-launch.sh
31-
%container.quarkus.jib.base-jvm-image=quay.io/kiegroup/kogito-runtime-jvm:latest
31+
%container.quarkus.jib.base-jvm-image=registry.access.redhat.com/ubi9/openjdk-17:1.20
3232
%container.quarkus.jib.working-directory=/home/kogito/bin

packages/sonataflow-operator/bddframework/pkg/framework/util.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const (
5151
// defaultBuilderImage Builder Image for Kogito
5252
defaultBuilderImage = "kogito-s2i-builder"
5353
// defaultRuntimeJVM Runtime Image for Kogito with JRE
54-
defaultRuntimeJVM = "kogito-runtime-jvm"
54+
defaultRuntimeJVM = "registry.access.redhat.com/ubi9/openjdk-17"
5555
//defaultRuntimeNative Runtime Image for Kogito for Native Quarkus Application
5656
defaultRuntimeNative = "kogito-runtime-native"
5757
// imageRegistryEnvVar ...
@@ -292,7 +292,11 @@ func AppendImageDefaultValues(image *api.Image) {
292292
}
293293

294294
if len(image.Tag) == 0 {
295-
image.Tag = GetKogitoImageVersion(version.GetTagVersion())
295+
if image.Name == defaultRuntimeJVM {
296+
image.Tag = GetKogitoImageVersion(version.GetOpenJDKImageTagVersion())
297+
} else {
298+
image.Tag = GetKogitoImageVersion(version.GetTagVersion())
299+
}
296300
}
297301
}
298302

packages/sonataflow-operator/version/version.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,15 @@ const (
3333
tagVersion = "main"
3434
// Kogito images tag version. Used for data-index and jobs-service images.
3535
kogitoImagesTagVersion = "999-20240623"
36+
// OpenJDK image tag version
37+
openJDKImageTagVersion = "1.20"
3638
)
3739

40+
// GetOpenJDKImageTagVersion gets the current OpenJDK image version.
41+
func GetOpenJDKImageTagVersion() string {
42+
return openJDKImageTagVersion
43+
}
44+
3845
// GetOperatorVersion gets the current binary version of the operator. Do not use it to compose image tags!
3946
func GetOperatorVersion() string {
4047
return operatorVersion

0 commit comments

Comments
 (0)