Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mariadb-image for openSUSE:Factory checked in at 2024-08-10 19:07:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb-image (Old) and /work/SRC/openSUSE:Factory/.mariadb-image.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb-image" Sat Aug 10 19:07:41 2024 rev:27 rq:1192985 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb-image/mariadb-image.changes 2024-08-09 16:16:06.994569400 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb-image.new.7232/mariadb-image.changes 2024-08-10 19:13:19.483546570 +0200 @@ -1,0 +2,10 @@ +Fri Aug 9 08:05:26 UTC 2024 - Dirk Mueller <dmueller@suse.com> + +- update entry point scripts from git + +------------------------------------------------------------------- +Thu Aug 8 19:28:10 UTC 2024 - Dirk Mueller <dmueller@suse.com> + +- add oci.image.ref.name + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.EfaYmG/_old 2024-08-10 19:13:20.951607537 +0200 +++ /var/tmp/diff_new_pack.EfaYmG/_new 2024-08-10 19:13:20.955607702 +0200 @@ -30,6 +30,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" +LABEL org.opencontainers.image.ref.name="11.4-%RELEASE%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.4-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" ++++++ docker-entrypoint.sh ++++++ --- /var/tmp/diff_new_pack.EfaYmG/_old 2024-08-10 19:13:21.023610527 +0200 +++ /var/tmp/diff_new_pack.EfaYmG/_new 2024-08-10 19:13:21.027610693 +0200 @@ -206,9 +206,11 @@ if [ "$user" = "0" ]; then # this will cause less disk access than `chown -R` - find "$DATADIR" \! -user mysql -exec chown mysql: '{}' + + find "$DATADIR" \! -user mysql \( -exec chown mysql: '{}' + -o -true \) # See https://github.com/MariaDB/mariadb-docker/issues/363 - find "${SOCKET%/*}" -maxdepth 0 \! -user mysql -exec chown mysql: '{}' \; + if [ "${SOCKET:0:1}" != '@' ]; then # not abstract sockets + find "${SOCKET%/*}" -maxdepth 0 \! -user mysql \( -exec chown mysql: '{}' \; -o -true \) + fi # memory.pressure local cgroup; cgroup=$(</proc/self/cgroup) @@ -355,7 +357,7 @@ local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\nprotocol=tcp\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } @@ -528,7 +530,7 @@ rm -rf "$DATADIR"/.init "$DATADIR"/.restore if [ "$(id -u)" = "0" ]; then # this will cause less disk access than `chown -R` - find "$DATADIR" \! -user mysql -exec chown mysql: '{}' + + find "$DATADIR" \! -user mysql \( -exec chown mysql: '{}' + -o -true \) fi done if _check_if_upgrade_is_needed; then ++++++ healthcheck.sh ++++++ --- /var/tmp/diff_new_pack.EfaYmG/_old 2024-08-10 19:13:21.055611856 +0200 +++ /var/tmp/diff_new_pack.EfaYmG/_new 2024-08-10 19:13:21.059612022 +0200 @@ -10,8 +10,8 @@ # the --replication option. This allows a different set of replication checks # on different connections. # -# --su{=|-mariadb} is option to run the healthcheck as a different unix user. -# Useful if mariadb@localhost user exists with unix socket authentication +# --su{=|-mysql} is option to run the healthcheck as a different unix user. +# Useful if mysql@localhost user exists with unix socket authentication # Using this option disregards previous options set, so should usually be the # first option. # @@ -32,7 +32,7 @@ # different from elsewhere. # # Note * though denied error message will result in error log without -# any permissions. +# any permissions. USAGE recommend to avoid this. set -eo pipefail @@ -43,6 +43,7 @@ ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ --skip-ssl --skip-ssl-verify-server-cert \ + --protocol socket \ -B "$@" } @@ -56,6 +57,16 @@ # isn't tested. connect() { + local s + # short cut mechanism, to work with --require-secure-transport + s=$(_process_sql --skip-column-names -e 'select @@skip_networking') + case "$s" in + 0|1) + connect_s=$s + return "$s"; + ;; + esac + # falling back to this if there wasn't a connection answer. set +e +o pipefail # (on second extra_file) # shellcheck disable=SC2086 @@ -70,9 +81,11 @@ set -eo pipefail if (( "$ret" == 0 )); then # grep Matched "Can't connect" so we fail - return 1 + connect_s=1 + else + connect_s=0 fi - return 0 + return $connect_s } # INNODB_INITIALIZED @@ -227,6 +240,7 @@ declare -A repl declare -A def nodefaults= +connect_s= datadir=/var/lib/mysql if [ -f $datadir/.my-healthcheck.cnf ]; then def['extra_file']=$datadir/.my-healthcheck.cnf @@ -353,4 +367,10 @@ fi shift done +if [ -z "$connect_s" ]; then + # we didn't do a connnect test, so the current success status is suspicious + # return what connect thinks. + connect + exit $? +fi