From eaf95ed68e7bc25a933c674274bee7a16fcedee4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 9 Oct 2023 20:52:57 +0200 Subject: [PATCH] [bitnami/mariadb] Release 10.5.22-debian-11-r45 (#51320) Signed-off-by: Bitnami Containers --- bitnami/mariadb/10.5/debian-11/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../10.5/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh | 1 - .../debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bitnami/mariadb/10.5/debian-11/Dockerfile b/bitnami/mariadb/10.5/debian-11/Dockerfile index 603e544435ad..da1671b1fde9 100644 --- a/bitnami/mariadb/10.5/debian-11/Dockerfile +++ b/bitnami/mariadb/10.5/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-04T08:10:12Z" \ + org.opencontainers.image.created="2023-10-09T17:09:10Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.5.22-debian-11-r44" \ + org.opencontainers.image.ref.name="10.5.22-debian-11-r45" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.5.22" @@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "ini-file-1.4.5-10-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ "mariadb-10.5.22-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 35a7a034261f..9b479add9dec 100644 --- a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.5-10" + "version": "1.4.6-1" }, "mariadb": { "arch": "amd64", diff --git a/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh index 55364bcd66f4..192984bec0a0 100644 --- a/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -162,7 +162,6 @@ log_error=${DB_LOGS_DIR}/mysqld.log slow_query_log=${DB_ENABLE_SLOW_QUERY} long_query_time=${DB_LONG_QUERY_TIME} character_set_server=${DB_DEFAULT_CHARACTER_SET} -collation_server=${DB_DEFAULT_COLLATE} plugin_dir=${DB_BASE_DIR}/lib/plugin datadir=${DB_DATA_DIR} diff --git a/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh index 13cf6666acfe..23c51b1d7340 100644 --- a/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh +++ b/bitnami/mariadb/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh @@ -96,8 +96,6 @@ export MARIADB_DEFAULT_PORT_NUMBER="3306" export DB_DEFAULT_PORT_NUMBER="$MARIADB_DEFAULT_PORT_NUMBER" # only used at build time export MARIADB_DEFAULT_CHARACTER_SET="utf8mb4" export DB_DEFAULT_CHARACTER_SET="$MARIADB_DEFAULT_CHARACTER_SET" # only used at build time -export MARIADB_DEFAULT_COLLATE="utf8mb4_unicode_ci" -export DB_DEFAULT_COLLATE="$MARIADB_DEFAULT_COLLATE" # only used at build time export MARIADB_DEFAULT_BIND_ADDRESS="0.0.0.0" export DB_DEFAULT_BIND_ADDRESS="$MARIADB_DEFAULT_BIND_ADDRESS" # only used at build time