From e11ae49a68497532d6bbc4d580d3f90d1ec9f483 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Thu, 9 Jan 2025 11:58:09 +0100
Subject: [PATCH] deps(jkube-tomcat9): bump tomcat9 from 9.0.89 to 9.0.98

---
 .github/workflows/build-images.yml | 2 +-
 .github/workflows/push-images.yml  | 2 +-
 jkube-tomcat9.yaml                 | 2 +-
 scripts/test-jkube-tomcat9.sh      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 5d4239c..430cb7a 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -30,7 +30,7 @@ jobs:
           - name: 'jkube-remote-dev'
             args: ''
           - name: 'jkube-tomcat9'
-            args: ''
+            args: --no-squash
           - name: 'jkube-tomcat'
             args: --no-squash
     steps:
diff --git a/.github/workflows/push-images.yml b/.github/workflows/push-images.yml
index 219c4ca..dd54109 100644
--- a/.github/workflows/push-images.yml
+++ b/.github/workflows/push-images.yml
@@ -26,7 +26,7 @@ jobs:
           - name: 'jkube-remote-dev'
             args: ''
           - name: 'jkube-tomcat9'
-            args: ''
+            args: --no-squash
           - name: 'jkube-tomcat'
             args: --no-squash
     steps:
diff --git a/jkube-tomcat9.yaml b/jkube-tomcat9.yaml
index 6489421..9a5d320 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.89-jdk21-temurin"
+from: "tomcat:9.0.98-jdk21-temurin"
 
 labels:
   - name: "io.k8s.display-name"
diff --git a/scripts/test-jkube-tomcat9.sh b/scripts/test-jkube-tomcat9.sh
index 1ffcaf6..8904fad 100755
--- a/scripts/test-jkube-tomcat9.sh
+++ b/scripts/test-jkube-tomcat9.sh
@@ -7,7 +7,7 @@ source "$BASEDIR/common.sh"
 
 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 'id')" "uid=1000(ubuntu) gid=1000(ubuntu) groups=1000(ubuntu)" || reportError "Invalid run user, should be 1000"
 
 java_version="$(dockerRun 'java -version')"
 assertMatches "$java_version" 'openjdk version "21.[0-9]+.[0-9]+".*' || reportError "Invalid Java version:\n\n$java_version"