pool/mariadb-image
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1223767 from devel:BCI:Tumbleweed

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

OBS-URL: https://build.opensuse.org/request/show/1223767
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-image?expand=0&rev=42
This commit is contained in:
Ana Guerrero 2024-11-13 14:28:36 +00:00 committed by Git OBS Bridge
commit aaba089e7a
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker-entrypoint.sh
View File

@ -121,6 +121,7 @@ mysql_get_config() {
docker_temp_server_start() { docker_temp_server_start() {
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \ "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
--expire-logs-days=0 \ --expire-logs-days=0 \
--skip-slave-start \
--loose-innodb_buffer_pool_load_at_startup=0 \ --loose-innodb_buffer_pool_load_at_startup=0 \
--skip-ssl --ssl-cert='' --ssl-key='' --ssl-ca='' \ --skip-ssl --ssl-cert='' --ssl-key='' --ssl-ca='' \
& &
@ -224,7 +225,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
echo -n "%%mariadb_version%%-MariaDB" echo -n "11.4.4-MariaDB"
} }
# initializes the database directory # initializes the database directory
@ -460,7 +461,6 @@ docker_setup_db() {
# To create replica user # To create replica user
local createReplicaUser= local createReplicaUser=
local changeMasterTo= local changeMasterTo=
local startReplica=
if [ -n "$MARIADB_REPLICATION_USER" ] ; then if [ -n "$MARIADB_REPLICATION_USER" ] ; then
if [ -z "$MARIADB_MASTER_HOST" ]; then if [ -z "$MARIADB_MASTER_HOST" ]; then
# on master # on master
@ -473,7 +473,6 @@ docker_setup_db() {
# SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value.
# shellcheck disable=SC2153 # 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;" 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
fi fi
@ -504,7 +503,6 @@ docker_setup_db() {
${userGrants} ${userGrants}
${changeMasterTo} ${changeMasterTo}
${startReplica}
EOSQL EOSQL
} }
@ -600,8 +598,7 @@ docker_mariadb_upgrade() {
fi fi
mysql_note "Starting temporary server" mysql_note "Starting temporary server"
docker_temp_server_start "$@" --skip-grant-tables \ docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \ --loose-innodb_buffer_pool_dump_at_shutdown=0
--skip-slave-start
mysql_note "Temporary server started." mysql_note "Temporary server started."
docker_mariadb_backup_system docker_mariadb_backup_system
@ -626,8 +623,7 @@ EOSQL
# need a restart as FLUSH PRIVILEGES isn't reversable # need a restart as FLUSH PRIVILEGES isn't reversable
mysql_note "Restarting temporary server for upgrade" mysql_note "Restarting temporary server for upgrade"
docker_temp_server_start "$@" --skip-grant-tables \ docker_temp_server_start "$@" --skip-grant-tables \
--loose-innodb_buffer_pool_dump_at_shutdown=0 \ --loose-innodb_buffer_pool_dump_at_shutdown=0
--skip-slave-start
else else
return 0 return 0
fi fi

5
healthcheck.sh
View File

@ -363,6 +363,11 @@ while [ $# -gt 0 ]; do
fi fi
nodefaults= nodefaults=
;; ;;
--no-connect)
# used for /docker-entrypoint-initdb.d scripts
# where you definately don't want a connection test
connect_s=0
;;
--*) --*)
test=${1#--} test=${1#--}
;; ;;

5
mariadb-image.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 12 15:34:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- update entrypoint from upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de> Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>