From 144831bb8e8b4029206e6c356cb18d95148c03d1 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 31 Aug 2023 16:17:45 +0200 Subject: [PATCH] [bitnami/minio] Release 2023.8.29-debian-11-r0 (#46741) * [bitnami/minio] Release 2023.8.29-debian-11-r0 Signed-off-by: Bitnami Containers * Update minio persistence directory to check in goss tests Signed-off-by: Gonzalo Gomez Gracia --------- Signed-off-by: Bitnami Containers Signed-off-by: Gonzalo Gomez Gracia Co-authored-by: Gonzalo Gomez Gracia --- .vib/minio/goss/vars.yaml | 2 +- bitnami/minio/2023/debian-11/Dockerfile | 14 +++++------ .../opt/bitnami/.bitnami_components.json | 6 ++--- .../opt/bitnami/scripts/libvalidations.sh | 8 +++---- .../debian-11/prebuildfs/usr/sbin/run-script | 24 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/libminio.sh | 12 ++++++++++ .../opt/bitnami/scripts/libminioclient.sh | 14 ++++++++++- .../rootfs/opt/bitnami/scripts/minio-env.sh | 2 +- .../rootfs/opt/bitnami/scripts/minio/setup.sh | 4 +++- bitnami/minio/2023/debian-11/tags-info.yaml | 2 +- 10 files changed, 69 insertions(+), 19 deletions(-) create mode 100755 bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script diff --git a/.vib/minio/goss/vars.yaml b/.vib/minio/goss/vars.yaml index f7efb9fab674..edc159cbfc33 100644 --- a/.vib/minio/goss/vars.yaml +++ b/.vib/minio/goss/vars.yaml @@ -5,7 +5,7 @@ binaries: directories: - mode: "0775" paths: - - /data + - /bitnami/minio/data - /certs - /opt/bitnami/minio/log - /opt/bitnami/minio/tmp diff --git a/bitnami/minio/2023/debian-11/Dockerfile b/bitnami/minio/2023/debian-11/Dockerfile index a220b4635aa1..5a783f5becbd 100644 --- a/bitnami/minio/2023/debian-11/Dockerfile +++ b/bitnami/minio/2023/debian-11/Dockerfile @@ -7,13 +7,13 @@ 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-07-21T03:46:44Z" \ + org.opencontainers.image.created="2023-08-31T09:51:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2023.7.18-debian-11-r2" \ + org.opencontainers.image.ref.name="2023.8.29-debian-11-r0" \ org.opencontainers.image.title="minio" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2023.7.18" + org.opencontainers.image.version="2023.8.29" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -26,9 +26,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl jq procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \ - "minio-client-2023.7.18-0-linux-${OS_ARCH}-debian-11" \ - "minio-2023.7.18-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-13-linux-${OS_ARCH}-debian-11" \ + "minio-client-2023.8.29-0-linux-${OS_ARCH}-debian-11" \ + "minio-2023.8.29-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/minio-client/postunpack.sh RUN /opt/bitnami/scripts/minio/postunpack.sh -ENV APP_VERSION="2023.7.18" \ +ENV APP_VERSION="2023.8.29" \ BITNAMI_APP_NAME="minio" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/minio-client/bin:/opt/bitnami/minio/bin:$PATH" diff --git a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2d90c1d54ec6..0a3b2eb59c52 100644 --- a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2023.7.18-0" + "version": "2023.8.29-0" }, "minio-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2023.7.18-0" + "version": "2023.8.29-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-9" + "version": "1.0.6-13" } } \ No newline at end of file diff --git a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 54987abca42a..16183f62d080 100644 --- a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -4,7 +4,7 @@ # # Validation functions library -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2086 # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh @@ -203,7 +203,7 @@ validate_ipv6() { if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then stat=0 fi - return "$stat" + return $stat } ######################## @@ -223,7 +223,7 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return "$stat" + return $stat } ######################## @@ -242,7 +242,7 @@ validate_ip() { else stat=$(validate_ipv6 "$ip") fi - return "$stat" + return $stat } ######################## diff --git a/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 000000000000..4ca0f897277e --- /dev/null +++ b/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-n}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh index 02cd2a45ad08..e63ec2effb06 100644 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh @@ -402,3 +402,15 @@ minio_node_hostname() { is_minio_not_running() { ! is_minio_running } + +minio_initialize() { + if am_i_root; then + debug "Ensuring MinIO daemon user/group exists" + ensure_user_exists "$MINIO_DAEMON_USER" --group "$MINIO_DAEMON_GROUP" + debug "Ensuring MinIO config folder '$MINIO_CLIENT_CONF_DIR' exists" + ensure_dir_exists "$MINIO_CLIENT_CONF_DIR" + if [[ -n "${MINIO_DAEMON_USER:-}" ]]; then + chown -R "${MINIO_DAEMON_USER:-}" "$MINIO_BASE_DIR" "$MINIO_DATA_DIR" "$MINIO_CLIENT_CONF_DIR" + fi + fi +} diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh index dcade341213a..571f6a4818f5 100644 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh @@ -62,7 +62,19 @@ minio_client_execute_timeout() { exec=$(command -v mc) if am_i_root; then - timeout 5s run_as_user "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" + cat > /tmp/cmd.sh << EOF +#!/bin/bash +# timeout forks its own shell process, so we need to provide it with the expected environment +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/minio-env.sh +. /opt/bitnami/scripts/minio-client-env.sh +. /opt/bitnami/scripts/libminio.sh +. /opt/bitnami/scripts/libminioclient.sh +run_as_user "$MINIO_DAEMON_USER" "${exec}" ${args[@]} +EOF + chmod +x /tmp/cmd.sh + timeout 5s bash -c "/tmp/cmd.sh" + rm -f /tmp/cmd.sh else timeout 5s "${exec}" "${args[@]}" fi diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-env.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-env.sh index c3225c1716b3..61850e5fa9cb 100644 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-env.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-env.sh @@ -60,7 +60,7 @@ export MINIO_CERTS_DIR="/certs" export MINIO_LOGS_DIR="${MINIO_BASE_DIR}/log" export MINIO_TMP_DIR="${MINIO_BASE_DIR}/tmp" export MINIO_SECRETS_DIR="${MINIO_BASE_DIR}/secrets" -export MINIO_DATA_DIR="/data" +export MINIO_DATA_DIR="/bitnami/minio/data" export MINIO_LOG_FILE="${MINIO_LOGS_DIR}/minio.log" export MINIO_PID_FILE="${MINIO_TMP_DIR}/minio.pid" export PATH="${MINIO_BIN_DIR}:${PATH}" diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh index 169ebc821fac..936a3d0aff18 100755 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh @@ -29,6 +29,8 @@ export MINIO_SERVER_SCHEME # Validate settings in MINIO_* env vars. minio_validate +minio_initialize + # Keys regeneration minio_regenerate_keys @@ -49,7 +51,7 @@ else data_drive="${drives[0]}" fi - # Trying to add a server within a minute. + # Try to add a local server within a minute. if ! retry_while "minio_client_configure_local ${data_drive:-MINIO_DATA_DIR}/.minio.sys/config/config.json"; then echo "Failed to add temporary MinIO server" exit 1 diff --git a/bitnami/minio/2023/debian-11/tags-info.yaml b/bitnami/minio/2023/debian-11/tags-info.yaml index ae331c98268d..823e768b725e 100644 --- a/bitnami/minio/2023/debian-11/tags-info.yaml +++ b/bitnami/minio/2023/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2023" - 2023-debian-11 -- 2023.7.18 +- 2023.8.29 - latest