From 9fa0ded18e58495fd81defa41f27e30cbf1d8e97 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 18 Oct 2021 16:14:10 +0000 Subject: [PATCH] 2021.10.13-debian-10-r0 release --- bitnami/minio/2021/debian-10/Dockerfile | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 45 ++++++++++++++++++- .../rootfs/opt/bitnami/scripts/libminio.sh | 4 +- bitnami/minio/README.md | 2 +- 5 files changed, 51 insertions(+), 8 deletions(-) diff --git a/bitnami/minio/2021/debian-10/Dockerfile b/bitnami/minio/2021/debian-10/Dockerfile index af1919fd8ce5..474bee28a4eb 100644 --- a/bitnami/minio/2021/debian-10/Dockerfile +++ b/bitnami/minio/2021/debian-10/Dockerfile @@ -10,14 +10,14 @@ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip jq procps tar RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio-client" "2021.10.7-0" --checksum f39c590e6fb454619af7658d755354276b0276a2f772e08bd4928abdf2f863c8 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio" "2021.10.6-0" --checksum 617018351944ec98e4ff051c6a508e738c0fddb2943138480221c292e0d58e37 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio" "2021.10.13-0" --checksum 35e54f7a9cb445c7eb6c8e6ba9f1fb5a790ebaf2379db6f77c9bd2e5a6f282fa RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/minio/postunpack.sh ENV BITNAMI_APP_NAME="minio" \ - BITNAMI_IMAGE_VERSION="2021.10.6-debian-10-r1" \ + BITNAMI_IMAGE_VERSION="2021.10.13-debian-10-r0" \ PATH="/opt/bitnami/minio-client/bin:/opt/bitnami/minio/bin:/opt/bitnami/common/bin:$PATH" VOLUME [ "/certs", "/data" ] diff --git a/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index bc5567224869..dfb43c4502f3 100644 --- a/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "minio": { "arch": "amd64", - "digest": "617018351944ec98e4ff051c6a508e738c0fddb2943138480221c292e0d58e37", + "digest": "35e54f7a9cb445c7eb6c8e6ba9f1fb5a790ebaf2379db6f77c9bd2e5a6f282fa", "distro": "debian-10", "type": "NAMI", - "version": "2021.10.6-0" + "version": "2021.10.13-0" }, "minio-client": { "arch": "amd64", diff --git a/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 4265aae0a673..6bd564773acb 100644 --- a/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/minio/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -39,18 +39,24 @@ group_exists() { # Arguments: # $1 - group # Flags: +# -i|--gid - the ID for the new group # -s|--system - Whether to create new user as system user (uid <= 999) # Returns: # None ######################### ensure_group_exists() { local group="${1:?group is missing}" + local gid="" local is_system_user=false # Validate arguments shift 1 while [ "$#" -gt 0 ]; do case "$1" in + -i|--gid) + shift + gid="${1:?missing gid}" + ;; -s|--system) is_system_user=true ;; @@ -64,6 +70,13 @@ ensure_group_exists() { if ! group_exists "$group"; then local -a args=("$group") + if [[ -n "$gid" ]]; then + if group_exists "$gid" ; then + error "The GID $gid is already in use." >&2 + return 1 + fi + args+=("--gid" "$gid") + fi $is_system_user && args+=("--system") groupadd "${args[@]}" >/dev/null 2>&1 fi @@ -74,7 +87,9 @@ ensure_group_exists() { # Arguments: # $1 - user # Flags: +# -i|--uid - the ID for the new user # -g|--group - the group the new user should belong to +# -a|--append-groups - comma-separated list of supplemental groups to append to the new user # -h|--home - the home directory for the new user # -s|--system - whether to create new user as system user (uid <= 999) # Returns: @@ -82,7 +97,9 @@ ensure_group_exists() { ######################### ensure_user_exists() { local user="${1:?user is missing}" + local uid="" local group="" + local append_groups="" local home="" local is_system_user=false @@ -90,10 +107,18 @@ ensure_user_exists() { shift 1 while [ "$#" -gt 0 ]; do case "$1" in + -i|--uid) + shift + uid="${1:?missing uid}" + ;; -g|--group) shift group="${1:?missing group}" ;; + -a|--append-groups) + shift + append_groups="${1:?missing append_groups}" + ;; -h|--home) shift home="${1:?missing home directory}" @@ -111,7 +136,15 @@ ensure_user_exists() { if ! user_exists "$user"; then local -a user_args=("-N" "$user") - $is_system_user && user_args+=("--system") + if [[ -n "$uid" ]]; then + if user_exists "$uid" ; then + error "The UID $uid is already in use." + return 1 + fi + user_args+=("--uid" "$uid") + else + $is_system_user && user_args+=("--system") + fi useradd "${user_args[@]}" >/dev/null 2>&1 fi @@ -122,6 +155,15 @@ ensure_user_exists() { usermod -g "$group" "$user" >/dev/null 2>&1 fi + if [[ -n "$append_groups" ]]; then + local -a groups + read -ra groups <<< "$(tr ',;' ' ' <<< "$append_groups")" + for group in "${groups[@]}"; do + ensure_group_exists "$group" + usermod -aG "$group" "$user" >/dev/null 2>&1 + done + fi + if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 @@ -403,3 +445,4 @@ generate_sha_hash() { local -r algorithm="${2:-1}" echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}' } + diff --git a/bitnami/minio/2021/debian-10/rootfs/opt/bitnami/scripts/libminio.sh b/bitnami/minio/2021/debian-10/rootfs/opt/bitnami/scripts/libminio.sh index ba45249610c7..aaa30b9ceaf6 100644 --- a/bitnami/minio/2021/debian-10/rootfs/opt/bitnami/scripts/libminio.sh +++ b/bitnami/minio/2021/debian-10/rootfs/opt/bitnami/scripts/libminio.sh @@ -174,8 +174,8 @@ minio_stop() { minio_client_execute_timeout admin service stop local >/dev/null 2>&1 || true local counter=5 - while is_minio_running; do - if [[ "$counter" -ne 0 ]]; then + while is_minio_running || is_service_running "$MINIO_PID"; do + if [[ "$counter" -le 0 ]]; then break fi sleep 1; diff --git a/bitnami/minio/README.md b/bitnami/minio/README.md index 32f438d7358c..27561c36e3d4 100644 --- a/bitnami/minio/README.md +++ b/bitnami/minio/README.md @@ -45,7 +45,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`2021`, `2021-debian-10`, `2021.10.6`, `2021.10.6-debian-10-r1`, `latest` (2021/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2021.10.6-debian-10-r1/2021/debian-10/Dockerfile) +* [`2021`, `2021-debian-10`, `2021.10.13`, `2021.10.13-debian-10-r0`, `latest` (2021/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2021.10.13-debian-10-r0/2021/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/minio GitHub repo](https://github.com/bitnami/bitnami-docker-minio).