From 4e25e7d13ada48c6293accaecde3cca1cc237e21 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 14 Aug 2024 13:31:06 +0200 Subject: [PATCH] [bitnami/mariadb] Release mariadb-10.11.9-debian-12-r0 (#70934) Signed-off-by: Bitnami Bot --- bitnami/mariadb/10.11/debian-12/Dockerfile | 12 +- .../debian-12/docker-compose-replication.yml | 51 +++++ .../opt/bitnami/.bitnami_components.json | 4 +- .../rootfs/opt/bitnami/scripts/libmariadb.sh | 200 ++++++++++-------- .../mariadb/10.11/debian-12/tags-info.yaml | 2 +- 5 files changed, 169 insertions(+), 100 deletions(-) create mode 100644 bitnami/mariadb/10.11/debian-12/docker-compose-replication.yml diff --git a/bitnami/mariadb/10.11/debian-12/Dockerfile b/bitnami/mariadb/10.11/debian-12/Dockerfile index d490bef9025d..b9a023914452 100644 --- a/bitnami/mariadb/10.11/debian-12/Dockerfile +++ b/bitnami/mariadb/10.11/debian-12/Dockerfile @@ -7,15 +7,15 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-07-25T05:00:02Z" \ + org.opencontainers.image.created="2024-08-14T11:03:25Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.11.8-debian-12-r6" \ + org.opencontainers.image.ref.name="10.11.9-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="10.11.8" + org.opencontainers.image.version="10.11.9" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,8 +28,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu72 liblzma5 libncurses6 libpam0g libssl3 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.7-2-linux-${OS_ARCH}-debian-12" \ - "mariadb-10.11.8-2-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.7-3-linux-${OS_ARCH}-debian-12" \ + "mariadb-10.11.9-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -49,7 +49,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="10.11.8" \ +ENV APP_VERSION="10.11.9" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/10.11/debian-12/docker-compose-replication.yml b/bitnami/mariadb/10.11/debian-12/docker-compose-replication.yml new file mode 100644 index 000000000000..46a947e4ae08 --- /dev/null +++ b/bitnami/mariadb/10.11/debian-12/docker-compose-replication.yml @@ -0,0 +1,51 @@ +# Copyright Broadcom, Inc. All Rights Reserved. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2.1' + +services: + mariadb-master: + image: docker.io/bitnami/mariadb:10.11 + ports: + - '3306' + volumes: + - 'mariadb_master_data:/bitnami/mariadb' + environment: + - MARIADB_REPLICATION_MODE=master + - MARIADB_REPLICATION_USER=repl_user + - MARIADB_USER=my_user + - MARIADB_DATABASE=my_database + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + - MARIADB_ROOT_PASSWORD=my_root_password + healthcheck: + test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh'] + interval: 15s + timeout: 5s + retries: 6 + + mariadb-slave: + image: docker.io/bitnami/mariadb:10.11 + ports: + - '3306' + depends_on: + - mariadb-master + environment: + - MARIADB_REPLICATION_MODE=slave + - MARIADB_REPLICATION_USER=repl_user + - MARIADB_USER=my_user + - MARIADB_DATABASE=my_database + - MARIADB_MASTER_HOST=mariadb-master + - MARIADB_MASTER_PORT_NUMBER=3306 + - MARIADB_MASTER_ROOT_PASSWORD=my_root_password + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + healthcheck: + test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh'] + interval: 15s + timeout: 5s + retries: 6 + +volumes: + mariadb_master_data: + driver: local diff --git a/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index c25d04c9c358..a20539eb2ac3 100644 --- a/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.7-2" + "version": "1.4.7-3" }, "mariadb": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "10.11.8-2" + "version": "10.11.9-0" } } \ No newline at end of file diff --git a/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh index bbc88ffd4421..3302e9acb103 100644 --- a/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -533,96 +533,6 @@ mariadb_upgrade() { debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded" } -######################## -# Ensure a db user exists with the given password for the '%' host -# Globals: -# DB_* -# Flags: -# -p|--password - database password -# -u|--user - database user -# --auth-plugin - authentication plugin -# --use-ldap - authenticate user via LDAP -# --host - database host -# --port - database host -# Arguments: -# $1 - database user -# Returns: -# None -######################### -mariadb_ensure_user_exists() { - local -r user="${1:?user is required}" - local password="" - local auth_plugin="" - local use_ldap="no" - local hosts - local auth_string="" - # For accessing an external database - local db_host="" - local db_port="" - - # Validate arguments - shift 1 - while [ "$#" -gt 0 ]; do - case "$1" in - -p|--password) - shift - password="${1:?missing database password}" - ;; - --auth-plugin) - shift - auth_plugin="${1:?missing authentication plugin}" - ;; - --use-ldap) - use_ldap="yes" - ;; - --host) - shift - db_host="${1:?missing database host}" - ;; - --port) - shift - db_port="${1:?missing database port}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - if is_boolean_yes "$use_ldap"; then - auth_string="identified via pam using '$DB_FLAVOR'" - elif [[ -n "$password" ]]; then - if [[ -n "$auth_plugin" ]]; then - auth_string="identified with $auth_plugin by '$password'" - else - auth_string="identified by '$password'" - fi - fi - debug "creating database user \'$user\'" - - local -a mysql_execute_cmd=("mysql_execute") - local -a mysql_execute_print_output_cmd=("mysql_execute_print_output") - if [[ -n "$db_host" && -n "$db_port" ]]; then - mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port") - mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port") - fi - - "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <&2 + return 1 + ;; + esac + shift + done + if is_boolean_yes "$use_ldap"; then + auth_string="identified via pam using '$DB_FLAVOR'" + elif [[ -n "$password" ]]; then + if [[ -n "$auth_plugin" ]]; then + auth_string="identified with $auth_plugin by '$password'" + else + auth_string="identified by '$password'" + fi + fi + debug "creating database user \'$user\'" + + local -a mysql_execute_cmd=("mysql_execute") + local -a mysql_execute_print_output_cmd=("mysql_execute_print_output") + if [[ -n "$db_host" && -n "$db_port" ]]; then + mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port") + mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port") + fi + + local mysql_create_user_cmd + [[ "$DB_FLAVOR" = "mariadb" ]] && mysql_create_user_cmd="create or replace user" || mysql_create_user_cmd="create user if not exists" + "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <=10.11 + local mysql_version="" + local major_version="" + local minor_version="" + mysql_version="$(mysql_get_version)" + major_version="$(get_sematic_version "${mysql_version}" 1)" + minor_version="$(get_sematic_version "${mysql_version}" 2)" + if [[ "${major_version}" -gt 10 ]] || [[ "${major_version}" -eq 10 && "${minor_version}" -eq 11 ]]; then + opts+=("--skip-ssl") + fi + fi fi echo "${opts[@]:-}" } diff --git a/bitnami/mariadb/10.11/debian-12/tags-info.yaml b/bitnami/mariadb/10.11/debian-12/tags-info.yaml index 784d68931b6b..7475a18d79b9 100644 --- a/bitnami/mariadb/10.11/debian-12/tags-info.yaml +++ b/bitnami/mariadb/10.11/debian-12/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.11" - 10.11-debian-12 -- 10.11.8 +- 10.11.9