From 376f4e0ea75b6ee24f08a73ad50eb37da85aeb0aa4e2e43bb658f53867cca3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 7 Oct 2024 20:56:15 +0000 Subject: [PATCH] [info=92fe02e23ea332e3af1f2893bd16cd13] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/apache-tomcat-10-image?expand=0&rev=3 --- Dockerfile.openjdk17 | 2 +- Dockerfile.openjdk21 | 2 +- Dockerfile.openjdk22 | 2 +- apache-tomcat-10-image.changes | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile.openjdk17 b/Dockerfile.openjdk17 index 2f4b08c..7489c4d 100644 --- a/Dockerfile.openjdk17 +++ b/Dockerfile.openjdk17 @@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-17-openjdk java-17-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 which curl sed java-17-openjdk java-17-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/Dockerfile.openjdk21 b/Dockerfile.openjdk21 index 4fb0943..9544dec 100644 --- a/Dockerfile.openjdk21 +++ b/Dockerfile.openjdk21 @@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 which curl sed java-21-openjdk java-21-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/Dockerfile.openjdk22 b/Dockerfile.openjdk22 index afb8cab..6d5a8e6 100644 --- a/Dockerfile.openjdk22 +++ b/Dockerfile.openjdk22 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-22-openjdk java-22-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 which curl sed java-22-openjdk java-22-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/apache-tomcat-10-image.changes b/apache-tomcat-10-image.changes index af2a7e1..3f37e7a 100644 --- a/apache-tomcat-10-image.changes +++ b/apache-tomcat-10-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 7 20:50:50 UTC 2024 - SUSE Update Bot + +- add which to the tomcat containers (bsc#1231347) + ------------------------------------------------------------------- Wed Oct 2 12:31:14 UTC 2024 - SUSE Update Bot