From 66ea7663be33dfd7e906eed80815c3e31a05f0b2 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 13 Oct 2021 14:47:48 +0000 Subject: [PATCH] 2.7.8-debian-10-r32 release --- bitnami/discourse/2/debian-10/Dockerfile | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 45 ++++++++++++++++++- bitnami/discourse/README.md | 2 +- 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile index 786eb6e9c0cd..d618130c04f8 100644 --- a/bitnami/discourse/2/debian-10/Dockerfile +++ b/bitnami/discourse/2/debian-10/Dockerfile @@ -14,7 +14,7 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" " RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "uglify-js" "3.14.2-0" --checksum 9a13413877669f8aed9936297a2240da5ff422085bba5b78cf28ff95cd78bde8 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ruby" "2.7.4-1" --checksum c0f9bcb452ea0833b81159c1e1656ab0174131930157659875309be2fed2d57c RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.4.0-0" --checksum 6c426cd27401d66914b19e8d647a5d1bda1f8cd632836aa2b8ce705c2d643e99 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "node" "14.18.0-0" --checksum 58c750af2e2a9b3c137d51f72b9512f9e313f772d28ec884798997519d2705b9 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "node" "14.18.1-0" --checksum 53575c1af09f423b9a2553b8b9880462f192961f4ada8fafa70a0238b106f26a RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.33.0-0" --checksum fd9a3245580fef6248f778efeba0a017675424f15ff16ace42c095496e4f02f3 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "brotli" "1.0.9-0" --checksum 710dd6f5c97af313d0e867e793bedc013aebe173f9c28d0fabc09a16d3100ab6 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e @@ -25,7 +25,7 @@ RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2' COPY rootfs / RUN /opt/bitnami/scripts/discourse/postunpack.sh ENV BITNAMI_APP_NAME="discourse" \ - BITNAMI_IMAGE_VERSION="2.7.8-debian-10-r31" \ + BITNAMI_IMAGE_VERSION="2.7.8-debian-10-r32" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/git/bin:/opt/bitnami/brotli/bin:$PATH" \ POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \ POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \ diff --git a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 10e5f4a91dcd..f4261f3fe952 100644 --- a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "node": { "arch": "amd64", - "digest": "58c750af2e2a9b3c137d51f72b9512f9e313f772d28ec884798997519d2705b9", + "digest": "53575c1af09f423b9a2553b8b9880462f192961f4ada8fafa70a0238b106f26a", "distro": "debian-10", "type": "NAMI", - "version": "14.18.0-0" + "version": "14.18.1-0" }, "postgresql-client": { "arch": "amd64", diff --git a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 4265aae0a673..6bd564773acb 100644 --- a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/discourse/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/discourse/README.md b/bitnami/discourse/README.md index 0c8233d6516e..8d0f1013eca4 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -33,7 +33,7 @@ $ docker-compose up -d 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/). -- [`2`, `2-debian-10`, `2.7.8`, `2.7.8-debian-10-r31`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.8-debian-10-r31/2/debian-10/Dockerfile) +- [`2`, `2-debian-10`, `2.7.8`, `2.7.8-debian-10-r32`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.8-debian-10-r32/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/discourse GitHub repo](https://github.com/bitnami/bitnami-docker-discourse).