From b25c0c46e9292b089de70ba0106f6f0903f501ac1b58f16f3dc9d9f51dbc7851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:18:32 +0000 Subject: [PATCH 1/2] [info=88b261f69764c624f87cdfc77d3332e9] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/openjdk-21-image?expand=0&rev=149 --- Dockerfile | 2 +- openjdk-21-image.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1884510..52df1dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends java-21-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-21-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-21-image.changes b/openjdk-21-image.changes index 3536d90..547edbf 100644 --- a/openjdk-21-image.changes +++ b/openjdk-21-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 16dd01c338342a8949136a414dccd16088c2f9366dea9d46c22264226b38ac65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:57:55 +0000 Subject: [PATCH 2/2] [info=79c91f354fa910c4c4acc1ad09a9f6c4] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/openjdk-21-image?expand=0&rev=150 --- Dockerfile | 5 ++++- openjdk-21-image.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 52df1dd..8c71fcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,10 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends java-21-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-21-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-21-image.changes b/openjdk-21-image.changes index 547edbf..55c8526 100644 --- a/openjdk-21-image.changes +++ b/openjdk-21-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