Merge pull request #1628 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed
SUSE · Sep 9, 2024 · fe6aaa1 · fe6aaa1
2 parents 7c61755 + c636074
commit fe6aaa1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/mariadb-image/Dockerfile b/mariadb-image/Dockerfile
@@ -20,7 +20,7 @@
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux findutils zstd; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.mariadb

diff --git a/mariadb-image/gosu b/mariadb-image/gosu
@@ -8,4 +8,4 @@ if ! id -u "$u" > /dev/null 2>&1; then
     exit 1
 fi
 
-exec setpriv --reuid="$u" --regid="$u" --clear-groups -- "$@"
+exec setpriv --pdeathsig=keep --reuid="$u" --regid="$u" --clear-groups -- "$@"
diff --git a/mariadb-image/mariadb-image.changes b/mariadb-image/mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 13:54:45 UTC 2024 - Madhankumar Chellamuthu <[email protected]>
+
+- add zstd for the upgrade scenario and fix signal handling
+
 -------------------------------------------------------------------
 Mon Sep  9 06:51:05 UTC 2024 - Dirk Mueller <[email protected]>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ if ! id -u "$u" > /dev/null 2>&1; then @@
         exit 1
     fi
-    exec setpriv --reuid="$u" --regid="$u" --clear-groups -- "$@"
+    exec setpriv --pdeathsig=keep --reuid="$u" --regid="$u" --clear-groups -- "$@"