Merge pull request #1876 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed
SUSE · Oct 23, 2024 · d845566 · d845566
2 parents a428cd1 + c11d4f9
commit d845566
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/apache-tomcat-10-image/Dockerfile.openjdk17 b/apache-tomcat-10-image/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/apache-tomcat-10-image/Dockerfile.openjdk21 b/apache-tomcat-10-image/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/apache-tomcat-10-image/Dockerfile.openjdk22 b/apache-tomcat-10-image/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/apache-tomcat-10-image.changes b/apache-tomcat-10-image/apache-tomcat-10-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 23 10:21:39 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- revert temporary explicit install of which
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/apache-tomcat-9-image/Dockerfile.openjdk17 b/apache-tomcat-9-image/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 tomcat which curl sed java-17-openjdk java-17-openjdk-headless; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat 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/apache-tomcat-9-image/apache-tomcat-9-image.changes b/apache-tomcat-9-image/apache-tomcat-9-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 23 10:21:39 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- revert temporary explicit install of which
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <[email protected]>