From 79f8232445a5ccb457c4622aa6720e6f6a9244f2 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Wed, 3 Aug 2022 09:57:21 +0200
Subject: [PATCH] deps: bump base image versions

---
 jkube-java-11.yaml            | 2 +-
 jkube-java.yaml               | 2 +-
 jkube-jetty9.yaml             | 2 +-
 jkube-karaf.yaml              | 2 +-
 jkube-tomcat9.yaml            | 2 +-
 scripts/common.sh             | 2 +-
 scripts/test-jkube-java-11.sh | 3 ++-
 scripts/test-jkube-java.sh    | 3 ++-
 scripts/test-jkube-jetty9.sh  | 9 +++++----
 scripts/test-jkube-karaf.sh   | 3 ++-
 scripts/test-jkube-tomcat.sh  | 5 +++--
 scripts/test-jkube-tomcat9.sh | 7 ++++---
 12 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/jkube-java-11.yaml b/jkube-java-11.yaml
index 232ab06..64160eb 100644
--- a/jkube-java-11.yaml
+++ b/jkube-java-11.yaml
@@ -3,7 +3,7 @@ schema_version: 1
 name: "quay.io/jkube/jkube-java-11"
 description: "Platform for building and running plain Java 11 applications (fat-jar and flat classpath)"
 version: "latest"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:8.5"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:8.6"
 
 labels:
   - name: "io.k8s.display-name"
diff --git a/jkube-java.yaml b/jkube-java.yaml
index d7962f5..a04670b 100644
--- a/jkube-java.yaml
+++ b/jkube-java.yaml
@@ -3,7 +3,7 @@ schema_version: 1
 name: "quay.io/jkube/jkube-java"
 description: "Platform for building and running plain Java applications (fat-jar and flat classpath)"
 version: "latest"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:8.5"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:8.6"
 
 labels:
   - name: "io.k8s.display-name"
diff --git a/jkube-jetty9.yaml b/jkube-jetty9.yaml
index 7babd08..ed9117e 100644
--- a/jkube-jetty9.yaml
+++ b/jkube-jetty9.yaml
@@ -3,7 +3,7 @@ schema_version: 1
 name: "quay.io/jkube/jkube-jetty9"
 description: "Base image for Jetty 9 webapp deployments"
 version: "latest"
-from: "jetty:9.4.46-jdk17-slim"
+from: "jetty:9.4.48-jdk17-alpine-eclipse-temurin"
 
 labels:
   - name: "io.k8s.display-name"
diff --git a/jkube-karaf.yaml b/jkube-karaf.yaml
index 14f1df2..219c2af 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/ubi8/openjdk-17:1.11"
+from: "registry.access.redhat.com/ubi8/openjdk-17:1.14"
 
 labels:
   - name: "io.k8s.display-name"
diff --git a/jkube-tomcat9.yaml b/jkube-tomcat9.yaml
index b4b3471..c4f4ba0 100644
--- a/jkube-tomcat9.yaml
+++ b/jkube-tomcat9.yaml
@@ -3,7 +3,7 @@ schema_version: 1
 name: "quay.io/jkube/jkube-tomcat9"
 description: "Base image for Apache Tomcat 9 webapp deployments"
 version: "latest"
-from: "tomcat:9.0.62-jdk17-temurin"
+from: "tomcat:9.0.65-jdk17-temurin"
 
 labels:
   - name: "io.k8s.display-name"
diff --git a/scripts/common.sh b/scripts/common.sh
index 35a2750..6e8c6cf 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -17,6 +17,6 @@ function assertMatches() {
 }
 
 function reportError() {
-  >&2 echo "$1"
+  >&2 printf "$1"
   exit 1
 }
diff --git a/scripts/test-jkube-java-11.sh b/scripts/test-jkube-java-11.sh
index aff44cd..2b038f1 100755
--- a/scripts/test-jkube-java-11.sh
+++ b/scripts/test-jkube-java-11.sh
@@ -9,7 +9,8 @@ IMAGE="quay.io/jkube/jkube-java-11:$TAG_OR_LATEST"
 
 assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000"
 
-assertMatches "$(dockerRun 'java -version')" 'openjdk version "11.0.[0-9]+' || reportError "Invalid Java version"
+java_version="$(dockerRun 'java -version')"
+assertMatches "$java_version" 'openjdk version "11.0.[0-9]+' || reportError "Invalid Java version:\n\n$java_version"
 
 # run-java dependent scripts
 jvm_tools="$(dockerRun 'ls -la /opt/jboss/container/java/jvm/')"
diff --git a/scripts/test-jkube-java.sh b/scripts/test-jkube-java.sh
index 965ee7d..5548f7d 100755
--- a/scripts/test-jkube-java.sh
+++ b/scripts/test-jkube-java.sh
@@ -9,7 +9,8 @@ IMAGE="quay.io/jkube/jkube-java:$TAG_OR_LATEST"
 
 assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000"
 
-assertMatches "$(dockerRun 'java -version')" 'openjdk version "17.0.[0-9]+' || reportError "Invalid Java version"
+java_version="$(dockerRun 'java -version')"
+assertMatches "$java_version" 'openjdk version "17.0.[0-9]+' || reportError "Invalid Java version:\n\n$java_version"
 
 # run-java dependent scripts
 jvm_tools="$(dockerRun 'ls -la /opt/jboss/container/java/jvm/')"
diff --git a/scripts/test-jkube-jetty9.sh b/scripts/test-jkube-jetty9.sh
index 065bad0..29f50da 100755
--- a/scripts/test-jkube-jetty9.sh
+++ b/scripts/test-jkube-jetty9.sh
@@ -7,9 +7,10 @@ source "$BASEDIR/common.sh"
 
 IMAGE="quay.io/jkube/jkube-jetty9:$TAG_OR_LATEST"
 
-assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000"
+assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root)" || reportError "Invalid run user, should be 1000"
 
-assertContains "$(dockerRun 'java -version')" 'openjdk version "17.0.2"' || reportError "Invalid Java version"
+java_version="$(dockerRun '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/')"
@@ -22,9 +23,9 @@ assertContains "$assembleScript" 'copy_dir maven$' || reportError "Invalid s2i a
 
 # Env
 env_variables="$(dockerRun 'env')"
-assertContains "$env_variables" "JAVA_HOME=/usr/local/openjdk-17$" \
+assertContains "$env_variables" "JAVA_HOME=/opt/java/openjdk$" \
   || reportError "JAVA_HOME invalid"
-assertContains "$env_variables" "JAVA_VERSION=17.0.2$" \
+assertContains "$env_variables" "JAVA_VERSION=jdk-17.0.4+8$" \
   || reportError "JAVA_VERSION invalid"
 assertContains "$env_variables" "JETTY_HOME=/usr/local/jetty$" \
   || reportError "JETTY_HOME invalid"
diff --git a/scripts/test-jkube-karaf.sh b/scripts/test-jkube-karaf.sh
index be650a3..37fbc6a 100755
--- a/scripts/test-jkube-karaf.sh
+++ b/scripts/test-jkube-karaf.sh
@@ -9,7 +9,8 @@ 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"
 
-assertContains "$(dockerRun 'java -version')" 'openjdk version "17.0.2"' || reportError "Invalid Java version"
+java_version="$(dockerRun '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/')"
diff --git a/scripts/test-jkube-tomcat.sh b/scripts/test-jkube-tomcat.sh
index 8142747..a6c74e3 100755
--- a/scripts/test-jkube-tomcat.sh
+++ b/scripts/test-jkube-tomcat.sh
@@ -9,7 +9,8 @@ IMAGE="quay.io/jkube/jkube-tomcat:$TAG_OR_LATEST"
 
 assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000"
 
-assertContains "$(dockerRun 'java -version')" 'openjdk version "17.0.2"' || reportError "Invalid Java version"
+java_version="$(dockerRun '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/')"
@@ -31,7 +32,7 @@ assertContains "$tomcatDir" "^webapps-javaee$" || reportError "webapps-javaee no
 env_variables="$(dockerRun 'env')"
 assertContains "$env_variables" "JAVA_HOME=/opt/java/openjdk$" \
   || reportError "JAVA_HOME invalid"
-assertContains "$env_variables" "JAVA_VERSION=jdk-17.0.2+8$" \
+assertContains "$env_variables" "JAVA_VERSION=jdk-17.0.4+8$" \
   || reportError "JAVA_VERSION invalid"
 assertContains "$env_variables" "CATALINA_HOME=/usr/local/tomcat$" \
   || reportError "CATALINA_HOME invalid"
diff --git a/scripts/test-jkube-tomcat9.sh b/scripts/test-jkube-tomcat9.sh
index 1b42045..ec6075a 100755
--- a/scripts/test-jkube-tomcat9.sh
+++ b/scripts/test-jkube-tomcat9.sh
@@ -9,7 +9,8 @@ IMAGE="quay.io/jkube/jkube-tomcat9:$TAG_OR_LATEST"
 
 assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000"
 
-assertContains "$(dockerRun 'java -version')" 'openjdk version "17.0.2"' || reportError "Invalid Java version"
+java_version="$(dockerRun '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/')"
@@ -24,11 +25,11 @@ assertContains "$assembleScript" 'copy_dir maven$' || reportError "Invalid s2i a
 env_variables="$(dockerRun 'env')"
 assertContains "$env_variables" "JAVA_HOME=/opt/java/openjdk$" \
   || reportError "JAVA_HOME invalid"
-assertContains "$env_variables" "JAVA_VERSION=jdk-17.0.2+8$" \
+assertContains "$env_variables" "JAVA_VERSION=jdk-17.0.4+8$" \
   || reportError "JAVA_VERSION invalid"
 assertContains "$env_variables" "CATALINA_HOME=/usr/local/tomcat$" \
   || reportError "CATALINA_HOME invalid"
-assertContains "$env_variables" "TOMCAT_VERSION=9.0.62$" \
+assertContains "$env_variables" "TOMCAT_VERSION=9.0.65$" \
   || reportError "TOMCAT_VERSION invalid"
 assertContains "$env_variables" "DEPLOYMENTS_DIR=/deployments$" \
   || reportError "DEPLOYMENTS_DIR invalid"