diff --git a/bitnami/minio-client/2021/debian-10/Dockerfile b/bitnami/minio-client/2021/debian-10/Dockerfile index e701326e207a..4148b0a3745e 100644 --- a/bitnami/minio-client/2021/debian-10/Dockerfile +++ b/bitnami/minio-client/2021/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip procps tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio-client" "2021.1.5-0" --checksum 043b737b44ceb31b8ad4e97ee2a2a5c933f1a88e20a11d00320046979d4fa71d +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio-client" "2021.1.16-0" --checksum f5adcf8641d1c5206a32ca992f1df5ab879c8f7af0cc9e538675fb63d5ef5db9 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/minio-client/postunpack.sh ENV BITNAMI_APP_NAME="minio-client" \ - BITNAMI_IMAGE_VERSION="2021.1.5-debian-10-r3" \ + BITNAMI_IMAGE_VERSION="2021.1.16-debian-10-r0" \ PATH="/opt/bitnami/minio-client/bin:/opt/bitnami/common/bin:$PATH" WORKDIR /opt/bitnami/minio-client diff --git a/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 0923b51e597b..6bbcdf182312 100644 --- a/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,9 +8,9 @@ }, "minio-client": { "arch": "amd64", - "digest": "043b737b44ceb31b8ad4e97ee2a2a5c933f1a88e20a11d00320046979d4fa71d", + "digest": "f5adcf8641d1c5206a32ca992f1df5ab879c8f7af0cc9e538675fb63d5ef5db9", "distro": "debian-10", "type": "NAMI", - "version": "2021.1.5-0" + "version": "2021.1.16-0" } } \ No newline at end of file diff --git a/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index cc45a19ce099..f38437a1d407 100644 --- a/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/minio-client/2021/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -37,14 +37,34 @@ group_exists() { # Create a group in the system if it does not exist already # Arguments: # $1 - group +# Flags: +# -s|--system - Whether to create new user as system user (uid <= 999) # Returns: # None ######################### ensure_group_exists() { local group="${1:?group is missing}" + local is_system_user=false + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + -s|--system) + is_system_user=true + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done if ! group_exists "$group"; then - groupadd "$group" >/dev/null 2>&1 + local -a args=("$group") + $is_system_user && args+=("--system") + groupadd "${args[@]}" >/dev/null 2>&1 fi } @@ -52,22 +72,60 @@ ensure_group_exists() { # Create an user in the system if it does not exist already # Arguments: # $1 - user -# $2 - group +# Flags: +# -g|--group - the group the new user should belong to +# -h|--home - the home directory for the new user +# -s|--system - whether to create new user as system user (uid <= 999) # Returns: # None ######################### ensure_user_exists() { local user="${1:?user is missing}" - local group="${2:-}" + local group="" + local home="" + local is_system_user=false + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + -g|--group) + shift + group="${1:?missing group}" + ;; + -h|--home) + shift + home="${1:?missing home directory}" + ;; + -s|--system) + is_system_user=true + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done if ! user_exists "$user"; then - useradd "$user" >/dev/null 2>&1 + local -a user_args=("-N" "$user") + $is_system_user && user_args+=("--system") + useradd "${user_args[@]}" >/dev/null 2>&1 fi if [[ -n "$group" ]]; then - ensure_group_exists "$group" + local -a group_args=("$group") + $is_system_user && group_args+=("--system") + ensure_group_exists "${group_args[@]}" usermod -a -G "$group" "$user" >/dev/null 2>&1 fi + + if [[ -n "$home" ]]; then + mkdir -p "$home" + usermod -d "$home" "$user" >/dev/null 2>&1 + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + fi } ######################## diff --git a/bitnami/minio-client/README.md b/bitnami/minio-client/README.md index eeb6352f40b1..add28b45a559 100644 --- a/bitnami/minio-client/README.md +++ b/bitnami/minio-client/README.md @@ -37,7 +37,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.1.16`, `2021.1.16-debian-10-r-1` (2021/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2021.1.16-debian-10-r-1/2021/debian-10/Dockerfile) +* [`2021`, `2021-debian-10`, `2021.1.16`, `2021.1.16-debian-10-r0` (2021/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2021.1.16-debian-10-r0/2021/debian-10/Dockerfile) * [`2020`, `2020-debian-10`, `2020.12.18`, `2020.12.18-debian-10-r31`, `latest` (2020/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2020.12.18-debian-10-r31/2020/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/minio-client GitHub repo](https://github.com/bitnami/bitnami-docker-minio-client).