From d35d499dea51427a4f658b9b19d18a66f202cede Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 18:34:51 +0200 Subject: [PATCH] [bitnami/percona-mysql] Release 8.0.32-24-debian-11-r3 (#28975) Signed-off-by: Bitnami Containers --- bitnami/percona-mysql/8.0/debian-11/Dockerfile | 14 +++++++------- .../opt/bitnami/.bitnami_components.json | 10 +++++----- .../prebuildfs/opt/bitnami/scripts/libservice.sh | 12 +++++++++--- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/bitnami/percona-mysql/8.0/debian-11/Dockerfile b/bitnami/percona-mysql/8.0/debian-11/Dockerfile index 93e42e898fac..ad6d01c21d68 100644 --- a/bitnami/percona-mysql/8.0/debian-11/Dockerfile +++ b/bitnami/percona-mysql/8.0/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-27T18:45:49Z" \ + org.opencontainers.image.created="2023-04-01T16:12:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.32-24-debian-11-r2" \ + org.opencontainers.image.ref.name="8.0.32-24-debian-11-r3" \ org.opencontainers.image.title="percona-mysql" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.0.32-24" @@ -22,11 +22,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaio1 libaudit1 libbrotli1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libnettle8 libnghttp2-14 libnuma-dev libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libudev1 libunistring2 libuuid1 libzstd1 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "percona-xtrabackup-binary-8.0.30-23-3-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \ - "percona-mysql-8.0.32-24-0-linux-${OS_ARCH}-debian-11" \ - "mysql-shell-8.0.31-4-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "percona-xtrabackup-binary-8.0.30-23-5-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.5-4-linux-${OS_ARCH}-debian-11" \ + "percona-mysql-8.0.32-24-2-linux-${OS_ARCH}-debian-11" \ + "mysql-shell-8.0.31-6-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 82f5f56f83f2..538eff153d63 100644 --- a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.5-2" + "version": "1.4.5-4" }, "mysql-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.31-4" + "version": "8.0.31-6" }, "percona-mysql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.32-24-0" + "version": "8.0.32-24-2" }, "percona-xtrabackup-binary": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.30-23-3" + "version": "8.0.30-23-5" } } \ No newline at end of file diff --git a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -279,7 +279,7 @@ remove_logrotate_conf() { # Flags: # --custom-service-content - Custom content to add to the [service] block # --environment - Environment variable to define (multiple --environment options may be passed) -# --environment-file - Text file with environment variables +# --environment-file - Text file with environment variables (multiple --environment-file options may be passed) # --exec-start - Start command (required) # --exec-start-pre - Pre-start command (optional) # --exec-start-post - Post-start command (optional) @@ -330,7 +330,6 @@ generate_systemd_conf() { | --type \ | --user \ | --group \ - | --environment-file \ | --exec-start \ | --exec-stop \ | --exec-reload \ @@ -368,6 +367,12 @@ generate_systemd_conf() { [[ -n "$environment" ]] && environment+=$'\n' environment+="Environment=${1:?"--environment value is missing"}" ;; + --environment-file) + shift + # It is possible to add multiple environment-file lines + [[ -n "$environment_file" ]] && environment_file+=$'\n' + environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}" + ;; *) echo "Invalid command line flag ${1}" >&2 return 1 @@ -435,7 +440,8 @@ EOF cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then - cat >> "$service_file" <<< "EnvironmentFile=${environment_file}" + # This variable may contain multiple EnvironmentFile= directives + cat >> "$service_file" <<< "$environment_file" fi # Logging if [[ -n "$standard_output" ]]; then