From 08e8637f6202c4a4315c4b8a77349f39248013bf45baa5f39984d3322edaeab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:16:59 +0000 Subject: [PATCH 1/2] [info=439809a66019b7ba330bbf136492acaa] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/golang-stable-image?expand=0&rev=178 --- Dockerfile | 4 ++-- golang-stable-image.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ccde00..516c894 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make 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 go1.23 go1.23-doc make 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.golang @@ -53,6 +53,6 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le RUN set -euo pipefail; if zypper -n install go1.23-race; then zypper -n clean; fi RUN set -euo pipefail; install -m 755 -d /go/bin /go/src -RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} WORKDIR /go diff --git a/golang-stable-image.changes b/golang-stable-image.changes index bb3e196..4862483 100644 --- a/golang-stable-image.changes +++ b/golang-stable-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller + +- improved log cleaning + ------------------------------------------------------------------- Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller From bd63b376623a33d9eba6061e4102fe9762ae19f7886f99f600ba195cd9921d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:56:15 +0000 Subject: [PATCH 2/2] [info=bf12f86655b32e18a53eca321c5e9989] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/golang-stable-image?expand=0&rev=179 --- Dockerfile | 5 ++++- golang-stable-image.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 516c894..8da3231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,10 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make 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 go1.23 go1.23-doc make 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.golang diff --git a/golang-stable-image.changes b/golang-stable-image.changes index 4862483..dac3362 100644 --- a/golang-stable-image.changes +++ b/golang-stable-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