From ade3fca269d1aead10d961809f1385206f18c343627661b45046fb45bf748a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:18:18 +0000 Subject: [PATCH 1/2] [info=351155e388011e03aba8bccff3d7d939] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/openjdk-17-image?expand=0&rev=196 --- Dockerfile | 2 +- openjdk-17-image.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7a0a859..f7a69b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.bci.openjdk diff --git a/openjdk-17-image.changes b/openjdk-17-image.changes index a81cfde..25203e2 100644 --- a/openjdk-17-image.changes +++ b/openjdk-17-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller + +- improved log cleaning + ------------------------------------------------------------------- Fri Sep 20 11:49:56 UTC 2024 - Dirk Mueller From 132ce26228408801b525461db77fefab22c8d809852c470c90616f47895f9511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:57:44 +0000 Subject: [PATCH 2/2] [info=4673771ad825036b3886b71c4abbdabc] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/openjdk-17-image?expand=0&rev=197 --- Dockerfile | 5 ++++- openjdk-17-image.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7a69b3..e1c5534 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,10 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends java-17-openjdk curl findutils gawk git-core procps util-linux; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.bci.openjdk diff --git a/openjdk-17-image.changes b/openjdk-17-image.changes index 25203e2..283ae18 100644 --- a/openjdk-17-image.changes +++ b/openjdk-17-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller