diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 92cc447..1d9e599 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -121,6 +121,7 @@ mysql_get_config() { docker_temp_server_start() { "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \ --expire-logs-days=0 \ + --skip-slave-start \ --loose-innodb_buffer_pool_load_at_startup=0 \ --skip-ssl --ssl-cert='' --ssl-key='' --ssl-ca='' \ & @@ -224,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "%%mariadb_version%%-MariaDB" + echo -n "11.4.4-MariaDB" } # initializes the database directory @@ -460,7 +461,6 @@ docker_setup_db() { # To create replica user local createReplicaUser= local changeMasterTo= - local startReplica= if [ -n "$MARIADB_REPLICATION_USER" ] ; then if [ -z "$MARIADB_MASTER_HOST" ]; then # on master @@ -473,7 +473,6 @@ docker_setup_db() { # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" - startReplica="START REPLICA;" fi fi @@ -504,7 +503,6 @@ docker_setup_db() { ${userGrants} ${changeMasterTo} - ${startReplica} EOSQL } @@ -600,8 +598,7 @@ docker_mariadb_upgrade() { fi mysql_note "Starting temporary server" docker_temp_server_start "$@" --skip-grant-tables \ - --loose-innodb_buffer_pool_dump_at_shutdown=0 \ - --skip-slave-start + --loose-innodb_buffer_pool_dump_at_shutdown=0 mysql_note "Temporary server started." docker_mariadb_backup_system @@ -626,8 +623,7 @@ EOSQL # need a restart as FLUSH PRIVILEGES isn't reversable mysql_note "Restarting temporary server for upgrade" docker_temp_server_start "$@" --skip-grant-tables \ - --loose-innodb_buffer_pool_dump_at_shutdown=0 \ - --skip-slave-start + --loose-innodb_buffer_pool_dump_at_shutdown=0 else return 0 fi diff --git a/healthcheck.sh b/healthcheck.sh index f605a3c..4db8805 100644 --- a/healthcheck.sh +++ b/healthcheck.sh @@ -363,6 +363,11 @@ while [ $# -gt 0 ]; do fi nodefaults= ;; + --no-connect) + # used for /docker-entrypoint-initdb.d scripts + # where you definately don't want a connection test + connect_s=0 + ;; --*) test=${1#--} ;; diff --git a/mariadb-image.changes b/mariadb-image.changes index 0b1d108..a4d8487 100644 --- a/mariadb-image.changes +++ b/mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 12 15:34:21 UTC 2024 - SUSE Update Bot + +- update entrypoint from upstream + ------------------------------------------------------------------- Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot