From c73cc187f9a69385839de6abf0a4b0d39c3248c3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 12 Oct 2021 18:47:54 +0000 Subject: [PATCH] 6.2.6-debian-10-r7 release --- .../redis-sentinel/6.2/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 45 ++++++++++++++++++- bitnami/redis-sentinel/README.md | 2 +- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/bitnami/redis-sentinel/6.2/debian-10/Dockerfile b/bitnami/redis-sentinel/6.2/debian-10/Dockerfile index 8b367b0bde2a..f0ab7e6d1fc7 100644 --- a/bitnami/redis-sentinel/6.2/debian-10/Dockerfile +++ b/bitnami/redis-sentinel/6.2/debian-10/Dockerfile @@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/redis-sentinel/postunpack.sh ENV BITNAMI_APP_NAME="redis-sentinel" \ - BITNAMI_IMAGE_VERSION="6.2.6-debian-10-r6" + BITNAMI_IMAGE_VERSION="6.2.6-debian-10-r7" EXPOSE 26379 diff --git a/bitnami/redis-sentinel/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/redis-sentinel/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 4265aae0a673..6bd564773acb 100644 --- a/bitnami/redis-sentinel/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/redis-sentinel/6.2/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/redis-sentinel/README.md b/bitnami/redis-sentinel/README.md index 1b1ded3761cb..2c2b52323388 100644 --- a/bitnami/redis-sentinel/README.md +++ b/bitnami/redis-sentinel/README.md @@ -47,7 +47,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/). -* [`6.2`, `6.2-debian-10`, `6.2.6`, `6.2.6-debian-10-r6`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.6-debian-10-r6/6.2/debian-10/Dockerfile) +* [`6.2`, `6.2-debian-10`, `6.2.6`, `6.2.6-debian-10-r7`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.6-debian-10-r7/6.2/debian-10/Dockerfile) * [`6.0`, `6.0-debian-10`, `6.0.16`, `6.0.16-debian-10-r7` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.0.16-debian-10-r7/6.0/debian-10/Dockerfile) * [`5.0`, `5.0-debian-10`, `5.0.14`, `5.0.14-debian-10-r7` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/5.0.14-debian-10-r7/5.0/debian-10/Dockerfile)