diff --git a/Dockerfile b/Dockerfile index 678c3a8..aed71d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.release-stage="released" # endlabelprefix -LABEL org.opencontainers.image.revision="%DISTURL%" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/mariadb-image/README.md" 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} diff --git a/gosu b/gosu index ba1e1f6..b5be55d 100644 --- a/gosu +++ b/gosu @@ -3,9 +3,9 @@ u=$1 shift -if ! id -u $u > /dev/null 2>&1; then +if ! id -u "$u" > /dev/null 2>&1; then echo "Invalid user: $u" exit 1 fi -setpriv --reuid=$u --regid=$u --clear-groups -- /bin/bash "$@" +exec setpriv --reuid="$u" --regid="$u" --clear-groups -- "$@" diff --git a/mariadb-image.changes b/mariadb-image.changes index f502e69..ef35cdf 100644 --- a/mariadb-image.changes +++ b/mariadb-image.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 8 16:48:44 UTC 2024 - Dirk Mueller + +- fix PID 1 in mariadb container (patch from Daniel Black) + +------------------------------------------------------------------- +Thu Aug 8 16:43:43 UTC 2024 - Dirk Mueller + +- remove oci reference annotation again + ------------------------------------------------------------------- Mon Aug 5 11:38:13 UTC 2024 - Dirk Mueller