From 09904c4ef9146e07062f35478f72d61741a9c04eb8adffd99b6176df9ba17b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 20 Dec 2023 17:35:02 +0000 Subject: [PATCH] [info=7ba6766dd5aec28047796e4159d55d05] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/mariadb-image?expand=0&rev=7 --- Dockerfile | 4 ++-- mariadb-image.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8163e75..25d0ca4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ LABEL org.opensuse.release-stage="released" # endlabelprefix -RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux; zypper -n clean; rm -rf /var/log/* +RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux pwgen; zypper -n clean; rm -rf /var/log/* ENTRYPOINT ["docker-entrypoint.sh"] CMD ["mariadbd"] EXPOSE 3306 @@ -49,7 +49,7 @@ COPY docker-entrypoint.sh /usr/local/bin/ RUN set -euo pipefail; chmod 755 /usr/local/bin/docker-entrypoint.sh RUN set -euo pipefail; ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat -RUN set -euo pipefail; sed -i 's#gosu mysql#su mysql -s /bin/bash -m#g' /usr/local/bin/docker-entrypoint.sh +RUN set -euo pipefail; sed -i -e 's,exec gosu mysql ,exec setpriv --reuid=mysql --regid=mysql --clear-groups -- /bin/bash ,g' /usr/local/bin/docker-entrypoint.sh # Ensure all logs goes to stdout RUN set -euo pipefail; sed -i 's/^log/#log/g' /etc/my.cnf diff --git a/mariadb-image.changes b/mariadb-image.changes index d35d475..2e0afa8 100644 --- a/mariadb-image.changes +++ b/mariadb-image.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 20 15:05:17 UTC 2023 - Dirk Mueller + +- set mariadbd as PID 1 in container +- add pwgen for MARIADB_RANDOM_ROOT_PASSWORD support + ------------------------------------------------------------------- Mon Oct 16 09:06:38 UTC 2023 - SUSE Update Bot