From 97cf860a6f06fd5a2125974c76b60df1ace2cc964ccf10855c190738b609d0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:16:58 +0000 Subject: [PATCH 1/2] [info=84e9f4e2f5fe23a5efba2e8df40e699b] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/golang-oldstable-image?expand=0&rev=178 --- Dockerfile | 4 ++-- golang-oldstable-image.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 132bd57..803cdd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-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.22 go1.22-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 @@ -52,6 +52,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.22-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-oldstable-image.changes b/golang-oldstable-image.changes index 8c4af13..2f96dac 100644 --- a/golang-oldstable-image.changes +++ b/golang-oldstable-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 8964a00f3a8774148383afb084bd06948e43a169b43011d271c458e5263b8f2e 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=2254ec695cf312900bc8a090667a3ccb] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/golang-oldstable-image?expand=0&rev=179 --- Dockerfile | 5 ++++- golang-oldstable-image.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 803cdd6..885c097 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,10 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-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.22 go1.22-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-oldstable-image.changes b/golang-oldstable-image.changes index 2f96dac..4235226 100644 --- a/golang-oldstable-image.changes +++ b/golang-oldstable-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