diff --git a/jkube-karaf.yaml b/jkube-karaf.yaml index 27a8e6a..228ab41 100644 --- a/jkube-karaf.yaml +++ b/jkube-karaf.yaml @@ -3,7 +3,7 @@ schema_version: 1 name: "quay.io/jkube/jkube-karaf" description: "Base image for Apache Karaf deployments" version: "latest" -from: "registry.access.redhat.com/ubi9/openjdk-21:1.17" +from: "registry.access.redhat.com/ubi9/openjdk-17:1.17" labels: - name: "io.k8s.display-name" diff --git a/scripts/test-jkube-karaf.sh b/scripts/test-jkube-karaf.sh index e59db47..553f6b9 100755 --- a/scripts/test-jkube-karaf.sh +++ b/scripts/test-jkube-karaf.sh @@ -10,7 +10,7 @@ IMAGE="quay.io/jkube/jkube-karaf:$TAG_OR_LATEST" assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000" java_version="$(dockerRun 'java -version')" -assertMatches "$java_version" 'openjdk version "21.0.[0-9]+' || reportError "Invalid Java version:\n\n$java_version" +assertMatches "$java_version" 'openjdk version "17.0.[0-9]+' || reportError "Invalid Java version:\n\n$java_version" # S2I scripts s2i="$(dockerRun 'ls -la /usr/local/s2i/')" @@ -25,9 +25,9 @@ assertContains "$(dockerRun 'cat /usr/local/s2i/run')" 'exec "$KARAF_HOME/bin/ka # Env env_variables="$(dockerRun 'env')" -assertContains "$env_variables" "JAVA_HOME=/usr/lib/jvm/java-21$" \ +assertContains "$env_variables" "JAVA_HOME=/usr/lib/jvm/java-17$" \ || reportError "JAVA_HOME invalid" -assertContains "$env_variables" "JAVA_VERSION=21$" \ +assertContains "$env_variables" "JAVA_VERSION=17$" \ || reportError "JAVA_VERSION invalid" assertContains "$env_variables" "KARAF_HOME=/deployments/karaf$" \ || reportError "KARAF_HOME invalid"