diff --git a/bitnami/mysql/9.3/debian-12/Dockerfile b/bitnami/mysql/9.3/debian-12/Dockerfile index d1b1adb778b4..35237162e27f 100644 --- a/bitnami/mysql/9.3/debian-12/Dockerfile +++ b/bitnami/mysql/9.3/debian-12/Dockerfile @@ -8,10 +8,9 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-05-30T15:23:44Z" \ + org.opencontainers.image.created="2025-06-29T15:43:11Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mysql/README.md" \ - org.opencontainers.image.ref.name="9.3.0-debian-12-r2" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mysql" \ org.opencontainers.image.title="mysql" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -26,9 +25,11 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gcc-11 libaio1 libcom-err2 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libsasl2-2 libssl3 libstdc++6 libtinfo6 libtirpc3 libudev1 procps psmisc -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ +RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ + DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ + mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "ini-file-1.4.7-16-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.8-0-linux-${OS_ARCH}-debian-12" \ "mysql-9.3.0-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -45,6 +46,7 @@ RUN apt-get update && apt-get upgrade -y && \ RUN chmod g+rwX /opt/bitnami RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true RUN mkdir /docker-entrypoint-initdb.d +RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/mysql/postunpack.sh diff --git a/bitnami/mysql/9.3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mysql/9.3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 38066f861da3..9c6abf034859 100644 --- a/bitnami/mysql/9.3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mysql/9.3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.7-16" + "version": "1.4.8-0" }, "mysql": { "arch": "amd64", diff --git a/bitnami/mysql/9.3/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/mysql/9.3/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/mysql/9.3/debian-12/prebuildfs/usr/sbin/uninstall_packages @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright Broadcom, Inc. All Rights Reserved. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get autoremove --purge -y "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/mysql/9.3/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/9.3/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh index d7b68369fcc8..95ffd55df67f 100644 --- a/bitnami/mysql/9.3/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh +++ b/bitnami/mysql/9.3/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh @@ -523,6 +523,23 @@ mysql_start_bg() { # # Library for mysql common +######################## +# Returns the path to the MySQL/MariaDB binary +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# Path to the MySQL/MariaDB binary +######################### +mysql_binary() { + if [[ "${DB_FLAVOR:-mysql}" = "mariadb" ]]; then + echo "${DB_BIN_DIR}/mariadb" + else + echo "${DB_BIN_DIR}/mysql" + fi +} + ######################## # Extract mysql version from version string # Globals: @@ -536,7 +553,7 @@ mysql_get_version() { local ver_string local -a ver_split - ver_string=$("${DB_BIN_DIR}/mysql" "--version") + ver_string=$("$(mysql_binary)" "--version") read -r -a ver_split <<< "$ver_string" if [[ "$ver_string" = *" Distrib "* ]]; then @@ -620,11 +637,11 @@ mysql_execute_print_output() { local mysql_cmd mysql_cmd="$(