From 501f284b672de1bd51791b5eadd5f38704eb4788726698e4626c01e77c927d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:17:06 +0000 Subject: [PATCH 1/2] [info=f25a207f2b7537428dd4bec1fcc9e8b7] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/grafana-image?expand=0&rev=189 --- Dockerfile | 2 +- grafana-image.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f27bbf..6fbc43c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends grafana; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; zypper -n in --no-recommends grafana; 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.application.grafana diff --git a/grafana-image.changes b/grafana-image.changes index 9239eec..d45067d 100644 --- a/grafana-image.changes +++ b/grafana-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 fd54f7b10cc404311c0c76876777127469f6f928e0546d81c7a7f94193658e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 25 Sep 2024 17:56:23 +0000 Subject: [PATCH 2/2] [info=73a62562d2e063a7c7a24cf81dc43177] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/grafana-image?expand=0&rev=190 --- Dockerfile | 5 ++++- grafana-image.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6fbc43c..533fec3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,10 @@ FROM opensuse/tumbleweed:latest -RUN set -euo pipefail; zypper -n in --no-recommends grafana; 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 grafana; \ + 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.application.grafana diff --git a/grafana-image.changes b/grafana-image.changes index d45067d..b24475e 100644 --- a/grafana-image.changes +++ b/grafana-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