From 8c9072f263b0545961fb6173ecaaa68cff86c255 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 22 Feb 2024 11:21:41 +1100 Subject: [PATCH 1/8] add 11.5 --- 11.5/Dockerfile | 142 ++++++++ 11.5/docker-entrypoint.sh | 707 ++++++++++++++++++++++++++++++++++++++ 11.5/healthcheck.sh | 353 +++++++++++++++++++ update.sh | 2 +- 4 files changed, 1203 insertions(+), 1 deletion(-) create mode 100644 11.5/Dockerfile create mode 100755 11.5/docker-entrypoint.sh create mode 100755 11.5/healthcheck.sh diff --git a/11.5/Dockerfile b/11.5/Dockerfile new file mode 100644 index 00000000..7c62ed68 --- /dev/null +++ b/11.5/Dockerfile @@ -0,0 +1,142 @@ +# vim:set ft=dockerfile: +FROM ubuntu:jammy + +# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added +RUN groupadd -r mysql && useradd -r -g mysql mysql --home-dir /var/lib/mysql + +# add gosu for easy step-down from root +# https://github.com/tianon/gosu/releases +# gosu key is B42F6819007F00F88E364FD4036A9C25BF357DD4 +ENV GOSU_VERSION 1.17 + +ARG GPG_KEYS=177F4010FE56CA3336300305F1656F24C74CD1D8 +# pub rsa4096 2016-03-30 [SC] +# 177F 4010 FE56 CA33 3630 0305 F165 6F24 C74C D1D8 +# uid [ unknown] MariaDB Signing Key +# sub rsa4096 2016-03-30 [E] +# install "libjemalloc2" as it offers better performance in some cases. Use with LD_PRELOAD +# install "pwgen" for randomizing passwords +# install "tzdata" for /usr/share/zoneinfo/ +# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files +# install "zstd" for .sql.zst docker-entrypoint-initdb.d files +# hadolint ignore=SC2086 +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates \ + gpg \ + gpgv \ + libjemalloc2 \ + pwgen \ + tzdata \ + xz-utils \ + zstd ; \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get install -y --no-install-recommends \ + dirmngr \ + gpg-agent \ + wget; \ + rm -rf /var/lib/apt/lists/*; \ + dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ + wget -q -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ + wget -q -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + export GNUPGHOME; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + for key in $GPG_KEYS; do \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ + done; \ + gpg --batch --export "$GPG_KEYS" > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + if command -v gpgconf >/dev/null; then \ + gpgconf --kill all; \ + fi; \ + gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ + gpgconf --kill all; \ + rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ + apt-mark auto '.*' > /dev/null; \ + [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark >/dev/null; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + chmod +x /usr/local/bin/gosu; \ + gosu --version; \ + gosu nobody true + +RUN mkdir /docker-entrypoint-initdb.d + +# Ensure the container exec commands handle range of utf8 characters based of +# default locales in base image (https://github.com/docker-library/docs/blob/135b79cc8093ab02e55debb61fdb079ab2dbce87/ubuntu/README.md#locales) +ENV LANG C.UTF-8 + +# OCI annotations to image +LABEL org.opencontainers.image.authors="MariaDB Community" \ + org.opencontainers.image.title="MariaDB Database" \ + org.opencontainers.image.description="MariaDB Database for relational SQL" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/mariadb/" \ + org.opencontainers.image.base.name="docker.io/library/ubuntu:jammy" \ + org.opencontainers.image.licenses="GPL-2.0" \ + org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ + org.opencontainers.image.vendor="MariaDB Community" \ + org.opencontainers.image.version="11.5.0" \ + org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" + +# bashbrew-architectures: amd64 arm64v8 ppc64le s390x +ARG MARIADB_VERSION=1:11.5.0+maria~ubu2204 +ENV MARIADB_VERSION $MARIADB_VERSION +# release-status:Alpha +# release-support-type:Unknown +# (https://downloads.mariadb.org/rest-api/mariadb/) + +# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.5.0/repo/ubuntu/ jammy main main/debug" + +RUN set -e;\ + echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ + { \ + echo 'Package: *'; \ + echo 'Pin: release o=MariaDB'; \ + echo 'Pin-Priority: 999'; \ + } > /etc/apt/preferences.d/mariadb +# add repository pinning to make sure dependencies from this MariaDB repo are preferred over Debian dependencies +# libmariadbclient18 : Depends: libmysqlclient18 (= 5.5.42+maria-1~wheezy) but 5.5.43-0+deb7u1 is to be installed + +# the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) +# also, we set debconf keys to make APT a little quieter +# hadolint ignore=DL3015 +RUN set -ex; \ + { \ + echo "mariadb-server" mysql-server/root_password password 'unused'; \ + echo "mariadb-server" mysql-server/root_password_again password 'unused'; \ + } | debconf-set-selections; \ + apt-get update; \ +# postinst script creates a datadir, so avoid creating it by faking its existance. + mkdir -p /var/lib/mysql/mysql ; touch /var/lib/mysql/mysql/user.frm ; \ +# mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos + apt-get install -y --no-install-recommends mariadb-server="$MARIADB_VERSION" mariadb-backup socat \ + ; \ + rm -rf /var/lib/apt/lists/*; \ +# purge and re-create /var/lib/mysql with appropriate ownership + rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \ + mkdir -p /var/lib/mysql /run/mysqld; \ + chown -R mysql:mysql /var/lib/mysql /run/mysqld; \ +# ensure that /run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime + chmod 1777 /run/mysqld; \ +# comment out a few problematic configuration values + find /etc/mysql/ -name '*.cnf' -print0 \ + | xargs -0 grep -lZE '^(bind-address|log|user\s)' \ + | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ +# don't reverse lookup hostnames, they are usually another container + printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) + if [ -L /etc/mysql/my.cnf ]; then \ +# 10.5+ + sed -i -e '/includedir/ {N;s/\(.*\)\n\(.*\)/\n\2\n\1/}' /etc/mysql/mariadb.cnf; \ + fi + + +VOLUME /var/lib/mysql + +COPY healthcheck.sh /usr/local/bin/healthcheck.sh +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +EXPOSE 3306 +CMD ["mariadbd"] diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh new file mode 100755 index 00000000..5c9fc4f0 --- /dev/null +++ b/11.5/docker-entrypoint.sh @@ -0,0 +1,707 @@ +#!/bin/bash +set -eo pipefail +shopt -s nullglob + +# logging functions +mysql_log() { + local type="$1"; shift + printf '%s [%s] [Entrypoint]: %s\n' "$(date --rfc-3339=seconds)" "$type" "$*" +} +mysql_note() { + mysql_log Note "$@" +} +mysql_warn() { + mysql_log Warn "$@" >&2 +} +mysql_error() { + mysql_log ERROR "$@" >&2 + exit 1 +} + +# usage: file_env VAR [DEFAULT] +# ie: file_env 'XYZ_DB_PASSWORD' 'example' +# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of +# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) +file_env() { + local var="$1" + local fileVar="${var}_FILE" + local def="${2:-}" + if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then + mysql_error "Both $var and $fileVar are set (but are exclusive)" + fi + local val="$def" + if [ "${!var:-}" ]; then + val="${!var}" + elif [ "${!fileVar:-}" ]; then + val="$(< "${!fileVar}")" + fi + export "$var"="$val" + unset "$fileVar" +} + +# set MARIADB_xyz from MYSQL_xyz when MARIADB_xyz is unset +# and make them the same value (so user scripts can use either) +_mariadb_file_env() { + local var="$1"; shift + local maria="MARIADB_${var#MYSQL_}" + file_env "$var" "$@" + file_env "$maria" "${!var}" + if [ "${!maria:-}" ]; then + export "$var"="${!maria}" + fi +} + +# check to see if this file is being run or sourced from another script +_is_sourced() { + # https://unix.stackexchange.com/a/215279 + [ "${#FUNCNAME[@]}" -ge 2 ] \ + && [ "${FUNCNAME[0]}" = '_is_sourced' ] \ + && [ "${FUNCNAME[1]}" = 'source' ] +} + +# usage: docker_process_init_files [file [file [...]]] +# ie: docker_process_init_files /always-initdb.d/* +# process initializer files, based on file extensions +docker_process_init_files() { + # mysql here for backwards compatibility "${mysql[@]}" + # ShellCheck: mysql appears unused. Verify use (or export if used externally) + # shellcheck disable=SC2034 + mysql=( docker_process_sql ) + + echo + local f + for f; do + case "$f" in + *.sh) + # https://github.com/docker-library/postgres/issues/450#issuecomment-393167936 + # https://github.com/docker-library/postgres/pull/452 + if [ -x "$f" ]; then + mysql_note "$0: running $f" + "$f" + else + mysql_note "$0: sourcing $f" + # ShellCheck can't follow non-constant source. Use a directive to specify location. + # shellcheck disable=SC1090 + . "$f" + fi + ;; + *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; + *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; + *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; + *.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; + *) mysql_warn "$0: ignoring $f" ;; + esac + echo + done +} + +# arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) +_verboseHelpArgs=( + --verbose --help +) + +mysql_check_config() { + local toRun=( "$@" "${_verboseHelpArgs[@]}" ) errors + if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then + mysql_error $'mariadbd failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors" + fi +} + +# Fetch value from server config +# We use mariadbd --verbose --help instead of my_print_defaults because the +# latter only show values present in config files, and not server defaults +mysql_get_config() { + local conf="$1"; shift + "$@" "${_verboseHelpArgs[@]}" 2>/dev/null \ + | awk -v conf="$conf" '$1 == conf && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }' + # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" +} + +# Do a temporary startup of the MariaDB server, for init purposes +docker_temp_server_start() { + "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \ + --expire-logs-days=0 \ + --loose-innodb_buffer_pool_load_at_startup=0 & + declare -g MARIADB_PID + MARIADB_PID=$! + mysql_note "Waiting for server startup" + # only use the root password if the database has already been initialized + # so that it won't try to fill in a password file when it hasn't been set yet + extraArgs=() + if [ -z "$DATABASE_ALREADY_EXISTS" ]; then + extraArgs+=( '--dont-use-mysql-root-password' ) + fi + local i + for i in {30..0}; do + if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then + break + fi + sleep 1 + done + if [ "$i" = 0 ]; then + mysql_error "Unable to start server." + fi +} + +# Stop the server. When using a local socket file mariadb-admin will block until +# the shutdown is complete. +docker_temp_server_stop() { + kill "$MARIADB_PID" + wait "$MARIADB_PID" +} + +# Verify that the minimally required password settings are set for new databases. +docker_verify_minimum_env() { + # Restoring from backup requires no environment variables + declare -g DATABASE_INIT_FROM_BACKUP + for file in /docker-entrypoint-initdb.d/*.tar{.gz,.xz,.zst}; do + if [ -f "${file}" ]; then + DATABASE_INIT_FROM_BACKUP='true' + return + fi + done + if [ -z "$MARIADB_ROOT_PASSWORD" ] && [ -z "$MARIADB_ROOT_PASSWORD_HASH" ] && [ -z "$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" ] && [ -z "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then + mysql_error $'Database is uninitialized and password option is not specified\n\tYou need to specify one of MARIADB_ROOT_PASSWORD, MARIADB_ROOT_PASSWORD_HASH, MARIADB_ALLOW_EMPTY_ROOT_PASSWORD and MARIADB_RANDOM_ROOT_PASSWORD' + fi + # More preemptive exclusions of combinations should have been made before *PASSWORD_HASH was added, but for now we don't enforce due to compatibility. + if [ -n "$MARIADB_ROOT_PASSWORD" ] || [ -n "$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" ] || [ -n "$MARIADB_RANDOM_ROOT_PASSWORD" ] && [ -n "$MARIADB_ROOT_PASSWORD_HASH" ]; then + mysql_error "Cannot specify MARIADB_ROOT_PASSWORD_HASH and another MARIADB_ROOT_PASSWORD* option." + fi + if [ -n "$MARIADB_PASSWORD" ] && [ -n "$MARIADB_PASSWORD_HASH" ]; then + mysql_error "Cannot specify MARIADB_PASSWORD_HASH and MARIADB_PASSWORD option." + fi + if [ -n "$MARIADB_REPLICATION_USER" ]; then + if [ -z "$MARIADB_MASTER_HOST" ]; then + # its a master, we're creating a user + if [ -z "$MARIADB_REPLICATION_PASSWORD" ] && [ -z "$MARIADB_REPLICATION_PASSWORD_HASH" ]; then + mysql_error "MARIADB_REPLICATION_PASSWORD or MARIADB_REPLICATION_PASSWORD_HASH not found to create replication user for master" + fi + else + # its a replica + if [ -z "$MARIADB_REPLICATION_PASSWORD" ] ; then + mysql_error "MARIADB_REPLICATION_PASSWORD is mandatory to specify the replication on the replica image." + fi + if [ -n "$MARIADB_REPLICATION_PASSWORD_HASH" ] ; then + mysql_warn "MARIADB_REPLICATION_PASSWORD_HASH cannot be specified on a replica" + fi + fi + fi + if [ -n "$MARIADB_MASTER_HOST" ] && { [ -z "$MARIADB_REPLICATION_USER" ] || [ -z "$MARIADB_REPLICATION_PASSWORD" ] ; }; then + mysql_error "For a replica, MARIADB_REPLICATION_USER and MARIADB_REPLICATION is mandatory." + fi +} + +# creates folders for the database +# also ensures permission for user mysql of run as root +docker_create_db_directories() { + local user; user="$(id -u)" + + # TODO other directories that are used by default? like /var/lib/mysql-files + # see https://github.com/docker-library/mysql/issues/562 + mkdir -p "$DATADIR" + + if [ "$user" = "0" ]; then + # this will cause less disk access than `chown -R` + find "$DATADIR" \! -user mysql -exec chown mysql: '{}' + + # See https://github.com/MariaDB/mariadb-docker/issues/363 + find "${SOCKET%/*}" -maxdepth 0 \! -user mysql -exec chown mysql: '{}' \; + + # memory.pressure + local cgroup; cgroup=$( "$DATADIR"/.my-healthcheck.cnf + $maskPreserve +} + +# Initializes database with timezone info and root password, plus optional extra db/user +docker_setup_db() { + # Load timezone info into database + if [ -z "$MARIADB_INITDB_SKIP_TZINFO" ]; then + # --skip-write-binlog usefully disables binary logging + # but also outputs LOCK TABLES to improve the IO of + # Aria (MDEV-23326) for 10.4+. + mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \ + | docker_process_sql --dont-use-mysql-root-password --database=mysql + # tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet + fi + # Generate random root password + if [ -n "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then + MARIADB_ROOT_PASSWORD="$(pwgen --numerals --capitalize --symbols --remove-chars="'\\" -1 32)" + export MARIADB_ROOT_PASSWORD MYSQL_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD + mysql_note "GENERATED ROOT PASSWORD: $MARIADB_ROOT_PASSWORD" + fi + + # Creates root users for non-localhost hosts + local rootCreate= + local rootPasswordEscaped= + if [ -n "$MARIADB_ROOT_PASSWORD" ]; then + # Sets root password and creates root users for non-localhost hosts + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") + fi + + # default root to listen for connections from anywhere + if [ -n "$MARIADB_ROOT_HOST" ] && [ "$MARIADB_ROOT_HOST" != 'localhost' ]; then + # ref "read -d ''", no, we don't care if read finds a terminating character in this heredoc + # https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151 + if [ -n "$MARIADB_ROOT_PASSWORD_HASH" ]; then + read -r -d '' rootCreate <<-EOSQL || true + CREATE USER 'root'@'${MARIADB_ROOT_HOST}' IDENTIFIED BY PASSWORD '${MARIADB_ROOT_PASSWORD_HASH}' ; + GRANT ALL ON *.* TO 'root'@'${MARIADB_ROOT_HOST}' WITH GRANT OPTION ; + GRANT PROXY ON ''@'%' TO 'root'@'${MARIADB_ROOT_HOST}' WITH GRANT OPTION; + EOSQL + else + read -r -d '' rootCreate <<-EOSQL || true + CREATE USER 'root'@'${MARIADB_ROOT_HOST}' IDENTIFIED BY '${rootPasswordEscaped}' ; + GRANT ALL ON *.* TO 'root'@'${MARIADB_ROOT_HOST}' WITH GRANT OPTION ; + GRANT PROXY ON ''@'%' TO 'root'@'${MARIADB_ROOT_HOST}' WITH GRANT OPTION; + EOSQL + fi + fi + + local mysqlAtLocalhost= + local mysqlAtLocalhostGrants= + # Install mysql@localhost user + if [ -n "$MARIADB_MYSQL_LOCALHOST_USER" ]; then + read -r -d '' mysqlAtLocalhost <<-EOSQL || true + CREATE USER mysql@localhost IDENTIFIED VIA unix_socket; + EOSQL + if [ -n "$MARIADB_MYSQL_LOCALHOST_GRANTS" ]; then + if [ "$MARIADB_MYSQL_LOCALHOST_GRANTS" != USAGE ]; then + mysql_warn "Excessive privileges ON *.* TO mysql@localhost facilitates risks to the confidentiality, integrity and availability of data stored" + fi + mysqlAtLocalhostGrants="GRANT ${MARIADB_MYSQL_LOCALHOST_GRANTS} ON *.* TO mysql@localhost;"; + fi + fi + + local createHealthCheckUsers + createHealthCheckUsers=$(create_healthcheck_users) + + local rootLocalhostPass= + if [ -z "$MARIADB_ROOT_PASSWORD_HASH" ]; then + # handle MARIADB_ROOT_PASSWORD_HASH for root@localhost after /docker-entrypoint-initdb.d + rootLocalhostPass="SET PASSWORD FOR 'root'@'localhost'= PASSWORD('${rootPasswordEscaped}');" + fi + + local createDatabase= + # Creates a custom database and user if specified + if [ -n "$MARIADB_DATABASE" ]; then + mysql_note "Creating database ${MARIADB_DATABASE}" + createDatabase="CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\`;" + fi + + local createUser= + local userGrants= + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + mysql_note "Creating user ${MARIADB_USER}" + if [ -n "$MARIADB_PASSWORD_HASH" ]; then + createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY PASSWORD '$MARIADB_PASSWORD_HASH';" + else + # SQL escape the user password, \ followed by ' + local userPasswordEscaped + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") + createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" + fi + + if [ -n "$MARIADB_DATABASE" ]; then + mysql_note "Giving user ${MARIADB_USER} access to schema ${MARIADB_DATABASE}" + userGrants="GRANT ALL ON \`${MARIADB_DATABASE//_/\\_}\`.* TO '$MARIADB_USER'@'%';" + fi + fi + + # To create replica user + local createReplicaUser= + local changeMasterTo= + local startReplica= + if [ -n "$MARIADB_REPLICATION_USER" ] ; then + if [ -z "$MARIADB_MASTER_HOST" ]; then + # on master + mysql_note "Creating user ${MARIADB_REPLICATION_USER}" + createReplicaUser=$(create_replica_user) + else + # on replica + local rplPasswordEscaped + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") + # 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 + + mysql_note "Securing system users (equivalent to running mysql_secure_installation)" + # tell docker_process_sql to not use MARIADB_ROOT_PASSWORD since it is just now being set + # --binary-mode to save us from the semi-mad users go out of their way to confuse the encoding. + docker_process_sql --dont-use-mysql-root-password --database=mysql --binary-mode <<-EOSQL + -- Securing system users shouldn't be replicated + SET @orig_sql_log_bin= @@SESSION.SQL_LOG_BIN; + SET @@SESSION.SQL_LOG_BIN=0; + -- we need the SQL_MODE NO_BACKSLASH_ESCAPES mode to be clear for the password to be set + SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', ''); + + DROP USER IF EXISTS root@'127.0.0.1', root@'::1'; + EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\''); + + ${rootLocalhostPass} + ${rootCreate} + ${mysqlAtLocalhost} + ${mysqlAtLocalhostGrants} + ${createHealthCheckUsers} + -- end of securing system users, rest of init now... + SET @@SESSION.SQL_LOG_BIN=@orig_sql_log_bin; + -- create users/databases + ${createDatabase} + ${createUser} + ${createReplicaUser} + ${userGrants} + + ${changeMasterTo} + ${startReplica} + EOSQL +} + +# create a new installation +docker_mariadb_init() +{ + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + + if [ -n "$DATABASE_INIT_FROM_BACKUP" ]; then + shopt -s dotglob + for file in /docker-entrypoint-initdb.d/*.tar{.gz,.xz,.zst}; do + mkdir -p "$DATADIR"/.init + tar --auto-compress --extract --file "$file" --directory="$DATADIR"/.init + mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back + + mv "$DATADIR"/.restore/** "$DATADIR"/ + if [ -f "$DATADIR/.init/backup-my.cnf" ]; then + mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" + mysql_note "Adding startup configuration:" + my_print_defaults --defaults-file="$DATADIR/.my.cnf" --mariadbd + fi + 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: '{}' + + fi + done + if _check_if_upgrade_is_needed; then + docker_mariadb_upgrade "$@" + fi + return + fi + docker_init_database_dir "$@" + + mysql_note "Starting temporary server" + docker_temp_server_start "$@" + mysql_note "Temporary server started." + + docker_setup_db + docker_process_init_files /docker-entrypoint-initdb.d/* + # Wait until after /docker-entrypoint-initdb.d is performed before setting + # root@localhost password to a hash we don't know the password for. + if [ -n "${MARIADB_ROOT_PASSWORD_HASH}" ]; then + mysql_note "Setting root@localhost password hash" + docker_process_sql --dont-use-mysql-root-password --binary-mode <<-EOSQL + SET @@SESSION.SQL_LOG_BIN=0; + SET PASSWORD FOR 'root'@'localhost'= '${MARIADB_ROOT_PASSWORD_HASH}'; + EOSQL + fi + + mysql_note "Stopping temporary server" + docker_temp_server_stop + mysql_note "Temporary server stopped" + + echo + mysql_note "MariaDB init process done. Ready for start up." + echo +} + +# backup the mysql database +docker_mariadb_backup_system() +{ + if [ -n "$MARIADB_DISABLE_UPGRADE_BACKUP" ] \ + && [ "$MARIADB_DISABLE_UPGRADE_BACKUP" = 1 ]; then + mysql_note "MariaDB upgrade backup disabled due to \$MARIADB_DISABLE_UPGRADE_BACKUP=1 setting" + return + fi + local backup_db="system_mysql_backup_unknown_version.sql.zst" + local oldfullversion="unknown_version" + if [ -r "$DATADIR"/mariadb_upgrade_info ]; then + read -r -d '' oldfullversion < "$DATADIR"/mariadb_upgrade_info || true + if [ -n "$oldfullversion" ]; then + backup_db="system_mysql_backup_${oldfullversion}.sql.zst" + fi + fi + + mysql_note "Backing up system database to $backup_db" + if ! mariadb-dump --skip-lock-tables --replace --databases mysql --socket="${SOCKET}" | zstd > "${DATADIR}/${backup_db}"; then + mysql_error "Unable backup system database for upgrade from $oldfullversion." + fi + mysql_note "Backing up complete" +} + +# perform mariadb-upgrade +# backup the mysql database if this is a major upgrade +docker_mariadb_upgrade() { + if [ -z "$MARIADB_AUTO_UPGRADE" ] \ + || [ "$MARIADB_AUTO_UPGRADE" = 0 ]; then + mysql_note "MariaDB upgrade (mariadb-upgrade or creating healthcheck users) required, but skipped due to \$MARIADB_AUTO_UPGRADE setting" + return + fi + mysql_note "Starting temporary server" + docker_temp_server_start "$@" --skip-grant-tables \ + --loose-innodb_buffer_pool_dump_at_shutdown=0 \ + --skip-slave-start + mysql_note "Temporary server started." + + docker_mariadb_backup_system + + if [ ! -f "$DATADIR"/.my-healthcheck.cnf ]; then + mysql_note "Creating healthcheck users" + local createHealthCheckUsers + createHealthCheckUsers=$(create_healthcheck_users) + docker_process_sql --dont-use-mysql-root-password --binary-mode <<-EOSQL + -- Healthcheck users shouldn't be replicated + SET @@SESSION.SQL_LOG_BIN=0; + -- we need the SQL_MODE NO_BACKSLASH_ESCAPES mode to be clear for the password to be set + SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', ''); + FLUSH PRIVILEGES; + $createHealthCheckUsers +EOSQL + mysql_note "Stopping temporary server" + docker_temp_server_stop + mysql_note "Temporary server stopped" + + if _check_if_upgrade_is_needed; then + # 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 + else + return 0 + fi + fi + + mysql_note "Starting mariadb-upgrade" + mariadb-upgrade --upgrade-system-tables + mysql_note "Finished mariadb-upgrade" + + mysql_note "Stopping temporary server" + docker_temp_server_stop + mysql_note "Temporary server stopped" +} + + +_check_if_upgrade_is_needed() { + if [ ! -f "$DATADIR"/mariadb_upgrade_info ]; then + mysql_note "MariaDB upgrade information missing, assuming required" + return 0 + fi + local mariadbVersion + mariadbVersion="$(_mariadb_version)" + IFS='.-' read -ra newversion <<<"$mariadbVersion" + IFS='.-' read -ra oldversion < "$DATADIR"/mariadb_upgrade_info || true + + if [[ ${#newversion[@]} -lt 2 ]] || [[ ${#oldversion[@]} -lt 2 ]] \ + || [[ ${oldversion[0]} -lt ${newversion[0]} ]] \ + || [[ ${oldversion[0]} -eq ${newversion[0]} && ${oldversion[1]} -lt ${newversion[1]} ]]; then + return 0 + fi + if [ ! -f "$DATADIR"/.my-healthcheck.cnf ]; then + mysql_note "MariaDB heathcheck configation file missing, assuming desirable" + return 0 + fi + mysql_note "MariaDB upgrade not required" + return 1 +} + +# check arguments for an option that would cause mariadbd to stop +# return true if there is one +_mysql_want_help() { + local arg + for arg; do + case "$arg" in + -'?'|--help|--print-defaults|-V|--version) + return 0 + ;; + esac + done + return 1 +} + +_main() { + # if command starts with an option, prepend mariadbd + if [ "${1:0:1}" = '-' ]; then + set -- mariadbd "$@" + fi + + #ENDOFSUBSTITUTIONS + # skip setup if they aren't running mysqld or want an option that stops mysqld + if [ "$1" = 'mariadbd' ] || [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then + mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started." + + mysql_check_config "$@" + # Load various environment variables + docker_setup_env "$@" + docker_create_db_directories + + # If container is started as root user, restart as dedicated mysql user + if [ "$(id -u)" = "0" ]; then + mysql_note "Switching to dedicated user 'mysql'" + exec gosu mysql "${BASH_SOURCE[0]}" "$@" + fi + + # there's no database, so it needs to be initialized + if [ -z "$DATABASE_ALREADY_EXISTS" ]; then + docker_verify_minimum_env + + docker_mariadb_init "$@" + # MDEV-27636 mariadb_upgrade --check-if-upgrade-is-needed cannot be run offline + #elif mariadb-upgrade --check-if-upgrade-is-needed; then + elif _check_if_upgrade_is_needed; then + docker_mariadb_upgrade "$@" + fi + fi + exec "$@" +} + +# If we are sourced from elsewhere, don't perform any further actions +if ! _is_sourced; then + _main "$@" +fi diff --git a/11.5/healthcheck.sh b/11.5/healthcheck.sh new file mode 100755 index 00000000..784f9bde --- /dev/null +++ b/11.5/healthcheck.sh @@ -0,0 +1,353 @@ +#!/bin/bash +# +# Healthcheck script for MariaDB +# +# Runs various tests on the MariaDB server to check its health. Pass the tests +# to run as arguments. If all tests succeed, the server is considered healthy, +# otherwise it's not. +# +# Arguments are processed in strict order. Set replication_* options before +# 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 +# Using this option disregards previous options set, so should usually be the +# first option. +# +# Some tests require SQL privileges. +# +# TEST MINIMUM GRANTS REQUIRED +# connect none* +# innodb_initialized USAGE +# innodb_buffer_pool_loaded USAGE +# galera_online USAGE +# galera_ready USAGE +# replication REPLICATION_CLIENT (<10.5)or REPLICA MONITOR (10.5+) +# mariadbupgrade none, however unix user permissions on datadir +# +# The SQL user used is the default for the mariadb client. This can be the unix user +# if no user(or password) is set in the [mariadb-client] section of a configuration +# file. --defaults-{file,extra-file,group-suffix} can specify a file/configuration +# different from elsewhere. +# +# Note * though denied error message will result in error log without +# any permissions. + +set -eo pipefail + +_process_sql() +{ + mariadb ${nodefaults:+--no-defaults} \ + ${def['file']:+--defaults-file=${def['file']}} \ + ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ + ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ + -B "$@" +} + +# TESTS + + +# CONNECT +# +# Tests that a connection can be made over TCP, the final state +# of the entrypoint and is listening. The authentication used +# isn't tested. +connect() +{ + set +e +o pipefail + # (on second extra_file) + # shellcheck disable=SC2086 + mariadb ${nodefaults:+--no-defaults} \ + ${def['file']:+--defaults-file=${def['file']}} \ + ${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \ + ${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \ + -h localhost --protocol tcp -e 'select 1' 2>&1 \ + | grep -qF "Can't connect" + local ret=${PIPESTATUS[1]} + set -eo pipefail + if (( "$ret" == 0 )); then + # grep Matched "Can't connect" so we fail + return 1 + fi + return 0 +} + +# INNODB_INITIALIZED +# +# This tests that the crash recovery of InnoDB has completed +# along with all the other things required to make it to a healthy +# operational state. Note this may return true in the early +# states of initialization. Use with a connect test to avoid +# these false positives. +innodb_initialized() +{ + local s + s=$(_process_sql --skip-column-names -e "select 1 from information_schema.ENGINES WHERE engine='innodb' AND support in ('YES', 'DEFAULT', 'ENABLED')") + [ "$s" == 1 ] +} + +# INNODB_BUFFER_POOL_LOADED +# +# Tests the load of the innodb buffer pool as been complete +# implies innodb_buffer_pool_load_at_startup=1 (default), or if +# manually SET innodb_buffer_pool_load_now=1 +innodb_buffer_pool_loaded() +{ + local s + s=$(_process_sql --skip-column-names -e "select VARIABLE_VALUE from information_schema.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_buffer_pool_load_status'") + if [[ $s =~ 'load completed' ]]; then + return 0 + fi + return 1 +} + +# GALERA_ONLINE +# +# Tests that the galera node is in the SYNCed state +galera_online() +{ + local s + s=$(_process_sql --skip-column-names -e "select VARIABLE_VALUE from information_schema.GLOBAL_STATUS WHERE VARIABLE_NAME='WSREP_LOCAL_STATE'") + # 4 from https://galeracluster.com/library/documentation/node-states.html#node-state-changes + # not https://xkcd.com/221/ + if [[ $s -eq 4 ]]; then + return 0 + fi + return 1 +} + +# GALERA_READY +# +# Tests that the Galera provider is ready. +galera_ready() +{ + local s + s=$(_process_sql --skip-column-names -e "select VARIABLE_VALUE from information_schema.GLOBAL_STATUS WHERE VARIABLE_NAME='WSREP_READY'") + if [ "$s" = "ON" ]; then + return 0 + fi + return 1 +} + +# REPLICATION +# +# Tests the replication has the required set of functions: +# --replication_all -> Checks all replication sources +# --replication_name=n -> sets the multisource connection name tested +# --replication_io -> IO thread is running +# --replication_sql -> SQL thread is running +# --replication_seconds_behind_master=n -> less than or equal this seconds of delay +# --replication_sql_remaining_delay=n -> less than or equal this seconds of remaining delay +# (ref: https://mariadb.com/kb/en/delayed-replication/) +replication() +{ + # SHOW REPLICA available 10.5+ + # https://github.com/koalaman/shellcheck/issues/2383 + # shellcheck disable=SC2016,SC2026 + _process_sql -e "SHOW ${repl['all']:+all} REPLICA${repl['all']:+S} ${repl['name']:+'${repl['name']}'} STATUS\G" | \ + { + # required for trim of leading space. + shopt -s extglob + # Row header + read -t 5 -r + # read timeout + [ $? -gt 128 ] && return 1 + while IFS=":" read -t 1 -r n v; do + # Trim leading space + n=${n##+([[:space:]])} + # Leading space on all values by the \G format needs to be trimmed. + v=${v:1} + case "$n" in + Slave_IO_Running) + if [ -n "${repl['io']}" ] && [ "$v" = 'No' ]; then + return 1 + fi + ;; + Slave_SQL_Running) + if [ -n "${repl['sql']}" ] && [ "$v" = 'No' ]; then + return 1 + fi + ;; + Seconds_Behind_Master) + # A NULL value is the IO thread not running: + if [ -n "${repl['seconds_behind_master']}" ] && + { [ "$v" = NULL ] || + (( "${repl['seconds_behind_master']}" < "$v" )); }; then + return 1 + fi + ;; + SQL_Remaining_Delay) + # Unlike Seconds_Behind_Master, sql_remaining_delay will hit NULL + # once replication is caught up - https://mariadb.com/kb/en/delayed-replication/ + if [ -n "${repl['sql_remaining_delay']}" ] && + [ "$v" != NULL ] && + (( "${repl['sql_remaining_delay']}" < "$v" )); then + return 1 + fi + ;; + esac + done + # read timeout + [ $? -gt 128 ] && return 1 + return 0 + } + # reachable in command not found(?) + # shellcheck disable=SC2317 + return $? +} + +# mariadbupgrade +# +# Test the lock on the file $datadir/mariadb_upgrade_info +# https://jira.mariadb.org/browse/MDEV-27068 +mariadbupgrade() +{ + local f="$datadir/mariadb_upgrade_info" + if [ -r "$f" ]; then + flock --exclusive --nonblock -n 9 9<"$f" + return $? + fi + return 0 +} + + +# MAIN + +if [ $# -eq 0 ]; then + echo "At least one argument required" >&2 + exit 1 +fi + +#ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ +# Global variables used by tests +declare -A repl +declare -A def +nodefaults= +datadir=/var/lib/mysql +if [ -f $datadir/.my-healthcheck.cnf ]; then + def['extra_file']=$datadir/.my-healthcheck.cnf +fi + +_repl_param_check() +{ + case "$1" in + seconds_behind_master) ;& + sql_remaining_delay) + if [ -z "${repl['io']}" ]; then + repl['io']=1 + echo "Forcing --replication_io=1, $1 requires IO thread to be running" >&2 + fi + ;; + all) + if [ -n "${repl['name']}" ]; then + unset 'repl[name]' + echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2 + fi + ;; + name) + if [ -n "${repl['all']}" ]; then + unset 'repl[all]' + echo "Option --replication_name incompatible with --replication_all, clearing replication_all" >&2 + fi + ;; + esac +} + +_test_exists() { + declare -F "$1" > /dev/null + return $? +} + +while [ $# -gt 0 ]; do + case "$1" in + --su=*) + u="${1#*=}" + shift + exec gosu "${u}" "${BASH_SOURCE[0]}" "$@" + ;; + --su) + shift + u=$1 + shift + exec gosu "$u" "${BASH_SOURCE[0]}" "$@" + ;; + --su-mysql) + shift + exec gosu mysql "${BASH_SOURCE[0]}" "$@" + ;; + --replication_*=*) + # Change the n to what is between _ and = and make lower case + n=${1#*_} + n=${n%%=*} + n=${n,,*} + # v is after the = + v=${1#*=} + repl[$n]=$v + _repl_param_check "$n" + ;; + --replication_*) + # Without =, look for a non --option next as the value, + # otherwise treat it as an "enable", just equate to 1. + # Clearing option is possible with "--replication_X=" + n=${1#*_} + n=${n,,*} + if [ "${2:0:2}" == '--' ]; then + repl[$n]=1 + else + repl[$n]=$2 + shift + fi + _repl_param_check "$n" + ;; + --datadir=*) + datadir=${1#*=} + ;; + --datadir) + shift + datadir=${1} + ;; + --no-defaults) + def=() + nodefaults=1 + ;; + --defaults-file=*|--defaults-extra-file=*|--defaults-group-suffix=*) + n=${1:11} # length --defaults- + n=${n%%=*} + n=${n//-/_} + # v is after the = + v=${1#*=} + def[$n]=$v + nodefaults= + ;; + --defaults-file|--defaults-extra-file|--defaults-group-suffix) + n=${1:11} # length --defaults- + n=${n//-/_} + if [ "${2:0:2}" == '--' ]; then + def[$n]="" + else + def[$n]=$2 + shift + fi + nodefaults= + ;; + --*) + test=${1#--} + ;; + *) + echo "Unknown healthcheck option $1" >&2 + exit 1 + esac + if [ -n "$test" ]; then + if ! _test_exists "$test" ; then + echo "healthcheck unknown option or test '$test'" >&2 + exit 1 + elif ! "$test"; then + echo "healthcheck $test failed" >&2 + exit 1 + fi + test= + fi + shift +done diff --git a/update.sh b/update.sh index 83593806..265a9bf4 100755 --- a/update.sh +++ b/update.sh @@ -171,8 +171,8 @@ in_development() if [ $# -eq 0 ]; then - all in_development + all exit 0 fi From 05f234f9cdc8fd902475ad3796d4eb43b5688650 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 22 Feb 2024 12:20:32 +1100 Subject: [PATCH 2/8] 11.5 update --- 11.5/Dockerfile | 2 ++ versions.json | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/11.5/Dockerfile b/11.5/Dockerfile index 7c62ed68..1b6efb07 100644 --- a/11.5/Dockerfile +++ b/11.5/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/versions.json b/versions.json index fc529174..498f9121 100644 --- a/versions.json +++ b/versions.json @@ -123,5 +123,19 @@ "arm64v8", "ppc64le" ] + }, + "11.5": { + "milestone": "11.5", + "version": "11.5.0", + "fullVersion": "1:11.5.0+maria~ubu2204", + "releaseStatus": "Alpha", + "supportType": "Unknown", + "base": "ubuntu:jammy", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] } } From 1b68a537b8e57eb9d4f349e26cbcfb34aa7456ae Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 17 Jan 2024 14:42:38 +1100 Subject: [PATCH 3/8] ubuntu-24.04 base for 11.4 --- 11.4/Dockerfile | 10 +++++----- 11.5/Dockerfile | 10 +++++----- update.sh | 8 +++++++- versions.json | 34 +++++++++++++++++----------------- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/11.4/Dockerfile b/11.4/Dockerfile index 704f7353..fbc29206 100644 --- a/11.4/Dockerfile +++ b/11.4/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM ubuntu:jammy +FROM ubuntu:noble # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql --home-dir /var/lib/mysql @@ -71,7 +71,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.title="MariaDB Database" \ org.opencontainers.image.description="MariaDB Database for relational SQL" \ org.opencontainers.image.documentation="https://hub.docker.com/_/mariadb/" \ - org.opencontainers.image.base.name="docker.io/library/ubuntu:jammy" \ + org.opencontainers.image.base.name="docker.io/library/ubuntu:noble" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ @@ -79,14 +79,14 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.4.1+maria~ubu2204 +ARG MARIADB_VERSION=1:11.4.1+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:RC -# release-support-type:Short Term Support +# release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.4.1/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.4.1/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.5/Dockerfile b/11.5/Dockerfile index 1b6efb07..cdb6001f 100644 --- a/11.5/Dockerfile +++ b/11.5/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM ubuntu:jammy +FROM ubuntu:noble # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql --home-dir /var/lib/mysql @@ -71,7 +71,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.title="MariaDB Database" \ org.opencontainers.image.description="MariaDB Database for relational SQL" \ org.opencontainers.image.documentation="https://hub.docker.com/_/mariadb/" \ - org.opencontainers.image.base.name="docker.io/library/ubuntu:jammy" \ + org.opencontainers.image.base.name="docker.io/library/ubuntu:noble" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ @@ -79,14 +79,14 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.5.0+maria~ubu2204 +ARG MARIADB_VERSION=1:11.5.0+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Alpha -# release-support-type:Unknown +# release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.5.0/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.5.0/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/update.sh b/update.sh index 265a9bf4..02363e61 100755 --- a/update.sh +++ b/update.sh @@ -4,16 +4,22 @@ set -Eeuo pipefail # Usage ./update.sh [version(multiple)...] # -defaultSuite='jammy' +defaultSuite='noble' declare -A suites=( [10.4]='focal' [10.5]='focal' [10.6]='focal' + [10.11]='jammy' + [11.0]='jammy' + [11.1]='jammy' + [11.2]='jammy' + [11.3]='jammy' ) declare -A suffix=( ['focal']='ubu2004' ['jammy']='ubu2204' + ['noble']='ubu2404' ) #declare -A dpkgArchToBashbrew=( diff --git a/versions.json b/versions.json index 498f9121..8efeb795 100644 --- a/versions.json +++ b/versions.json @@ -1,11 +1,25 @@ { + "11.5": { + "milestone": "11.5", + "version": "11.5.0", + "fullVersion": "1:11.5.0+maria~ubu2404", + "releaseStatus": "Alpha", + "supportType": "Short Term Support", + "base": "ubuntu:noble", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] + }, "11.4": { "milestone": "11.4", "version": "11.4.1", - "fullVersion": "1:11.4.1+maria~ubu2204", + "fullVersion": "1:11.4.1+maria~ubu2404", "releaseStatus": "RC", - "supportType": "Short Term Support", - "base": "ubuntu:jammy", + "supportType": "Long Term Support", + "base": "ubuntu:noble", "arches": [ "amd64", "arm64v8", @@ -123,19 +137,5 @@ "arm64v8", "ppc64le" ] - }, - "11.5": { - "milestone": "11.5", - "version": "11.5.0", - "fullVersion": "1:11.5.0+maria~ubu2204", - "releaseStatus": "Alpha", - "supportType": "Unknown", - "base": "ubuntu:jammy", - "arches": [ - "amd64", - "arm64v8", - "ppc64le", - "s390x" - ] } } From 1e14bcaa60fcacbfbd9191d1138869b5dc81fed7 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 11 Apr 2024 14:16:56 +0700 Subject: [PATCH 4/8] Revert "Workaround issue #560 by removing character-set-collations" This reverts commit d7a950d41e9347ac94ad2d2f28469bff74858db7. --- 10.11/Dockerfile | 2 -- 10.5/Dockerfile | 2 -- 10.6/Dockerfile | 2 -- 11.0/Dockerfile | 2 -- 11.1/Dockerfile | 2 -- 11.2/Dockerfile | 2 -- 11.3/Dockerfile | 2 -- 11.4/Dockerfile | 2 -- Dockerfile.template | 2 -- update.sh | 5 +---- 10 files changed, 1 insertion(+), 22 deletions(-) diff --git a/10.11/Dockerfile b/10.11/Dockerfile index eb0ffd31..1dfbb5a7 100644 --- a/10.11/Dockerfile +++ b/10.11/Dockerfile @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/10.5/Dockerfile b/10.5/Dockerfile index 87fa3de0..5dc76d5b 100644 --- a/10.5/Dockerfile +++ b/10.5/Dockerfile @@ -127,8 +127,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/10.6/Dockerfile b/10.6/Dockerfile index a1e6406b..6d173a23 100644 --- a/10.6/Dockerfile +++ b/10.6/Dockerfile @@ -127,8 +127,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 279c81b2..b5db3d65 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.1/Dockerfile b/11.1/Dockerfile index 90304b2a..e62f5f83 100644 --- a/11.1/Dockerfile +++ b/11.1/Dockerfile @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.2/Dockerfile b/11.2/Dockerfile index 0016c7a6..fb3a5535 100644 --- a/11.2/Dockerfile +++ b/11.2/Dockerfile @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.3/Dockerfile b/11.3/Dockerfile index 3b553cef..45acd7ed 100644 --- a/11.3/Dockerfile +++ b/11.3/Dockerfile @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.4/Dockerfile b/11.4/Dockerfile index fbc29206..9244ea0f 100644 --- a/11.4/Dockerfile +++ b/11.4/Dockerfile @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/Dockerfile.template b/Dockerfile.template index f58ca090..57a966c2 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -127,8 +127,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/update.sh b/update.sh index 02363e61..e2a9222e 100755 --- a/update.sh +++ b/update.sh @@ -71,10 +71,7 @@ update_version() -e '/memory\.pressure/,+7d' \ "$version/docker-entrypoint.sh" sed -i -e 's/ REPLICA\$/ SLAVE$/' "$version"/healthcheck.sh - sed -i -e 's/\/run/\/var\/run\//g' \ - -e '/character-set-collations/d' \ - -e '/^# Issue #560/d' \ - "$version/Dockerfile" + sed -i -e 's/\/run/\/var\/run\//g' "$version/Dockerfile" ;; # almost nothing to see/do here 10.5) sed -i -e '/--old-mode/d' \ From 6ec93d58655917b4bd430e067ddd3ab86a4f45fd Mon Sep 17 00:00:00 2001 From: Alex1s Date: Sun, 5 May 2024 22:38:07 +0200 Subject: [PATCH 5/8] do not pass mariadbd arguments with whitespace to mariadb-install-db --- 10.11/docker-entrypoint.sh | 12 +++++++++++- 10.4/docker-entrypoint.sh | 12 +++++++++++- 10.5/docker-entrypoint.sh | 12 +++++++++++- 10.6/docker-entrypoint.sh | 12 +++++++++++- 11.0/docker-entrypoint.sh | 12 +++++++++++- 11.1/docker-entrypoint.sh | 12 +++++++++++- 11.2/docker-entrypoint.sh | 12 +++++++++++- 11.3/docker-entrypoint.sh | 12 +++++++++++- 11.4/docker-entrypoint.sh | 12 +++++++++++- 11.5/docker-entrypoint.sh | 12 +++++++++++- docker-entrypoint.sh | 12 +++++++++++- 11 files changed, 121 insertions(+), 11 deletions(-) diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index 20fefd4b..cc334181 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index 0253377e..51403d5b 100755 --- a/10.4/docker-entrypoint.sh +++ b/10.4/docker-entrypoint.sh @@ -220,7 +220,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) - mysql_install_db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --default-time-zone=SYSTEM --enforce-storage-engine= \ --skip-log-bin \ diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index 02234409..10150f90 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -220,7 +220,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) - mysql_install_db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --default-time-zone=SYSTEM --enforce-storage-engine= \ --skip-log-bin \ diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index bb9aef30..70da970f 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -220,7 +220,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh index 5c9fc4f0..7b6af63b 100755 --- a/11.0/docker-entrypoint.sh +++ b/11.0/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh index 5c9fc4f0..7b6af63b 100755 --- a/11.1/docker-entrypoint.sh +++ b/11.1/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh index 5c9fc4f0..7b6af63b 100755 --- a/11.2/docker-entrypoint.sh +++ b/11.2/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/11.3/docker-entrypoint.sh b/11.3/docker-entrypoint.sh index 5c9fc4f0..7b6af63b 100755 --- a/11.3/docker-entrypoint.sh +++ b/11.3/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh index 5c9fc4f0..7b6af63b 100755 --- a/11.4/docker-entrypoint.sh +++ b/11.4/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh index 5c9fc4f0..7b6af63b 100755 --- a/11.5/docker-entrypoint.sh +++ b/11.5/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here) - mariadb-install-db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9bf76235..bf65735f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) - mysql_install_db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ ! "$arg" =~ [[:space:]] ]]; then + mariadbdArgs+=("$arg") + else + mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + fi + done + mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ From 9d9bf3e7328c9b469cd2ac00d75b5d67753862a6 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 17 May 2024 18:43:07 +1000 Subject: [PATCH 6/8] release 2024 q2 --- 10.11/Dockerfile | 6 +++--- 10.4/Dockerfile | 6 +++--- 10.5/Dockerfile | 6 +++--- 10.6/Dockerfile | 6 +++--- 11.0/Dockerfile | 6 +++--- 11.1/Dockerfile | 6 +++--- 11.2/Dockerfile | 6 +++--- 11.5/Dockerfile | 4 +--- versions.json | 30 +++++++++++++++--------------- 9 files changed, 37 insertions(+), 39 deletions(-) diff --git a/10.11/Dockerfile b/10.11/Dockerfile index 1dfbb5a7..eccf7f7b 100644 --- a/10.11/Dockerfile +++ b/10.11/Dockerfile @@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="10.11.7" \ + org.opencontainers.image.version="10.11.8" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:10.11.7+maria~ubu2204 +ARG MARIADB_VERSION=1:10.11.8+maria~ubu2204 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.7/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.8/repo/ubuntu/ jammy main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/10.4/Dockerfile b/10.4/Dockerfile index 177a2fc4..b8aa5b19 100644 --- a/10.4/Dockerfile +++ b/10.4/Dockerfile @@ -75,20 +75,20 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="10.4.33" \ + org.opencontainers.image.version="10.4.34" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le ARG MARIADB_MAJOR=10.4 ENV MARIADB_MAJOR $MARIADB_MAJOR -ARG MARIADB_VERSION=1:10.4.33+maria~ubu2004 +ARG MARIADB_VERSION=1:10.4.34+maria~ubu2004 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.33/repo/ubuntu/ focal main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.34/repo/ubuntu/ focal main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/10.5/Dockerfile b/10.5/Dockerfile index 5dc76d5b..23ef5ca7 100644 --- a/10.5/Dockerfile +++ b/10.5/Dockerfile @@ -75,20 +75,20 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="10.5.24" \ + org.opencontainers.image.version="10.5.25" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_MAJOR=10.5 ENV MARIADB_MAJOR $MARIADB_MAJOR -ARG MARIADB_VERSION=1:10.5.24+maria~ubu2004 +ARG MARIADB_VERSION=1:10.5.25+maria~ubu2004 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.24/repo/ubuntu/ focal main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.25/repo/ubuntu/ focal main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/10.6/Dockerfile b/10.6/Dockerfile index 6d173a23..1c37d556 100644 --- a/10.6/Dockerfile +++ b/10.6/Dockerfile @@ -75,20 +75,20 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="10.6.17" \ + org.opencontainers.image.version="10.6.18" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_MAJOR=10.6 ENV MARIADB_MAJOR $MARIADB_MAJOR -ARG MARIADB_VERSION=1:10.6.17+maria~ubu2004 +ARG MARIADB_VERSION=1:10.6.18+maria~ubu2004 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.17/repo/ubuntu/ focal main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.18/repo/ubuntu/ focal main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index b5db3d65..9cd12011 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="11.0.5" \ + org.opencontainers.image.version="11.0.6" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.0.5+maria~ubu2204 +ARG MARIADB_VERSION=1:11.0.6+maria~ubu2204 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.0.5/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.0.6/repo/ubuntu/ jammy main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.1/Dockerfile b/11.1/Dockerfile index e62f5f83..99d66fa7 100644 --- a/11.1/Dockerfile +++ b/11.1/Dockerfile @@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="11.1.4" \ + org.opencontainers.image.version="11.1.5" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.1.4+maria~ubu2204 +ARG MARIADB_VERSION=1:11.1.5+maria~ubu2204 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.1.4/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.1.5/repo/ubuntu/ jammy main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.2/Dockerfile b/11.2/Dockerfile index fb3a5535..657e955f 100644 --- a/11.2/Dockerfile +++ b/11.2/Dockerfile @@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="11.2.3" \ + org.opencontainers.image.version="11.2.4" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.2.3+maria~ubu2204 +ARG MARIADB_VERSION=1:11.2.4+maria~ubu2204 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.2.3/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.2.4/repo/ubuntu/ jammy main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.5/Dockerfile b/11.5/Dockerfile index cdb6001f..3551d84f 100644 --- a/11.5/Dockerfile +++ b/11.5/Dockerfile @@ -81,7 +81,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=1:11.5.0+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION -# release-status:Alpha +# release-status:RC # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -125,8 +125,6 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ -# Issue #560 - sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/versions.json b/versions.json index 8efeb795..79a600bd 100644 --- a/versions.json +++ b/versions.json @@ -3,7 +3,7 @@ "milestone": "11.5", "version": "11.5.0", "fullVersion": "1:11.5.0+maria~ubu2404", - "releaseStatus": "Alpha", + "releaseStatus": "RC", "supportType": "Short Term Support", "base": "ubuntu:noble", "arches": [ @@ -43,8 +43,8 @@ }, "11.2": { "milestone": "11.2", - "version": "11.2.3", - "fullVersion": "1:11.2.3+maria~ubu2204", + "version": "11.2.4", + "fullVersion": "1:11.2.4+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:jammy", @@ -57,8 +57,8 @@ }, "11.1": { "milestone": "11.1", - "version": "11.1.4", - "fullVersion": "1:11.1.4+maria~ubu2204", + "version": "11.1.5", + "fullVersion": "1:11.1.5+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:jammy", @@ -71,8 +71,8 @@ }, "11.0": { "milestone": "11.0", - "version": "11.0.5", - "fullVersion": "1:11.0.5+maria~ubu2204", + "version": "11.0.6", + "fullVersion": "1:11.0.6+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:jammy", @@ -85,8 +85,8 @@ }, "10.11": { "milestone": "10.11", - "version": "10.11.7", - "fullVersion": "1:10.11.7+maria~ubu2204", + "version": "10.11.8", + "fullVersion": "1:10.11.8+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:jammy", @@ -99,8 +99,8 @@ }, "10.6": { "milestone": "10.6", - "version": "10.6.17", - "fullVersion": "1:10.6.17+maria~ubu2004", + "version": "10.6.18", + "fullVersion": "1:10.6.18+maria~ubu2004", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:focal", @@ -113,8 +113,8 @@ }, "10.5": { "milestone": "10.5", - "version": "10.5.24", - "fullVersion": "1:10.5.24+maria~ubu2004", + "version": "10.5.25", + "fullVersion": "1:10.5.25+maria~ubu2004", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:focal", @@ -127,8 +127,8 @@ }, "10.4": { "milestone": "10.4", - "version": "10.4.33", - "fullVersion": "1:10.4.33+maria~ubu2004", + "version": "10.4.34", + "fullVersion": "1:10.4.34+maria~ubu2004", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:focal", From 012f09c4e582a09e5803d3558feb03e87cf50ee5 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 17 May 2024 18:50:03 +1000 Subject: [PATCH 7/8] reorder like faustin reviewed, and shellcheck pass --- 10.11/docker-entrypoint.sh | 6 +++--- 10.4/docker-entrypoint.sh | 6 +++--- 10.5/docker-entrypoint.sh | 6 +++--- 10.6/docker-entrypoint.sh | 6 +++--- 11.0/docker-entrypoint.sh | 6 +++--- 11.1/docker-entrypoint.sh | 6 +++--- 11.2/docker-entrypoint.sh | 6 +++--- 11.3/docker-entrypoint.sh | 6 +++--- 11.4/docker-entrypoint.sh | 6 +++--- 11.5/docker-entrypoint.sh | 6 +++--- docker-entrypoint.sh | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index cc334181..22c45d3d 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index 51403d5b..7447669a 100755 --- a/10.4/docker-entrypoint.sh +++ b/10.4/docker-entrypoint.sh @@ -224,10 +224,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index 10150f90..838d5f3e 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -224,10 +224,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index 70da970f..49a3f0d9 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -224,10 +224,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh index 7b6af63b..08c08d97 100755 --- a/11.0/docker-entrypoint.sh +++ b/11.0/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh index 7b6af63b..08c08d97 100755 --- a/11.1/docker-entrypoint.sh +++ b/11.1/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh index 7b6af63b..08c08d97 100755 --- a/11.2/docker-entrypoint.sh +++ b/11.2/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/11.3/docker-entrypoint.sh b/11.3/docker-entrypoint.sh index 7b6af63b..08c08d97 100755 --- a/11.3/docker-entrypoint.sh +++ b/11.3/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh index 7b6af63b..08c08d97 100755 --- a/11.4/docker-entrypoint.sh +++ b/11.4/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh index 7b6af63b..08c08d97 100755 --- a/11.5/docker-entrypoint.sh +++ b/11.5/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index bf65735f..cf079bc5 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -232,10 +232,10 @@ docker_init_database_dir() { local mariadbdArgs=() for arg in "${@:2}"; do # Check if the argument contains whitespace - if [[ ! "$arg" =~ [[:space:]] ]]; then - mariadbdArgs+=("$arg") + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." else - mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace. + mariadbdArgs+=("$arg") fi done mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ From e4497a7c278e8190f3c27c4ff15a94a824bc6a28 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 17 May 2024 19:01:56 +1000 Subject: [PATCH 8/8] ignore 11.[345] for now on release --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 6b8ee453..39e05c4b 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -25,7 +25,7 @@ command -v bashbrew >/dev/null || { source '.architectures-lib' -GLOBIGNORE=examples/:.*/:test/:11.5/ +GLOBIGNORE=examples/:.*/:test/:11.[345]/ versions=( */ ) versions=( "${versions[@]%/}" )