diff --git a/Dockerfile.openjdk17 b/Dockerfile.openjdk17 index bd08fc3..77232e8 100644 --- a/Dockerfile.openjdk17 +++ b/Dockerfile.openjdk17 @@ -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 which curl sed java-17-openjdk java-17-openjdk-headless; \ + 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 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 e8f77b3..90ba7c8 100644 --- a/Dockerfile.openjdk21 +++ b/Dockerfile.openjdk21 @@ -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 which curl sed java-21-openjdk java-21-openjdk-headless; \ + 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 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 d8d1088..7cc4068 100644 --- a/Dockerfile.openjdk22 +++ b/Dockerfile.openjdk22 @@ -26,7 +26,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 which curl sed java-22-openjdk java-22-openjdk-headless; \ + 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 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 e824c45..7d6df40 100644 --- a/apache-tomcat-10-image.changes +++ b/apache-tomcat-10-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 10:21:39 UTC 2024 - SUSE Update Bot + +- revert temporary explicit install of which + ------------------------------------------------------------------- Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot