Accepting request 1134356 from devel:BCI:Tumbleweed

🤖: sync package with devel:BCI:Tumbleweed from OBS

OBS-URL: https://build.opensuse.org/request/show/1134356
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-image?expand=0&rev=2
This commit is contained in:
Ana Guerrero 2023-12-21 22:38:46 +00:00 committed by Git OBS Bridge
commit eaababbd95
2 changed files with 8 additions and 2 deletions

View File

@ -38,7 +38,7 @@ LABEL org.opensuse.release-stage="released"
# endlabelprefix # 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"] ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["mariadbd"] CMD ["mariadbd"]
EXPOSE 3306 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; 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; 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 # Ensure all logs goes to stdout
RUN set -euo pipefail; sed -i 's/^log/#log/g' /etc/my.cnf RUN set -euo pipefail; sed -i 's/^log/#log/g' /etc/my.cnf

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 20 15:05:17 UTC 2023 - Dirk Mueller <dmueller@suse.com>
- 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 <bci-internal@suse.de> Mon Oct 16 09:06:38 UTC 2023 - SUSE Update Bot <bci-internal@suse.de>