6.8.19-debian-10-r20 release

2021-10-12 15:32:00 +00:00 · 2021-10-12 15:32:00 +00:00 · 9056f9ed50
parent b7c70ecfba
commit 9056f9ed50
4 changed files with 49 additions and 6 deletions
--- a/bitnami/elasticsearch/6/debian-10/Dockerfile
+++ b/bitnami/elasticsearch/6/debian-10/Dockerfile
@ -12,7 +12,7 @@ ARG ELASTICSEARCH_PLUGINS=""
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip hostname libc6 procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.13.3-0" --checksum 83a1fc829033b78da3d99335556ecd7cda5f6265ded711d09d23966f72facd10
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.13.4-0" --checksum e8e4175266f100a9a74b9cbdcb44867581c4648d83735ed42e04c3fb89d38009
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.12-0" --checksum 14c1274e93b1135d4d1b82ad7985fc2fa7f5d0689b6da18e0c94da37407cd4ea
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "elasticsearch" "6.8.19-0" --checksum 613a9e587765babcd47c691d55ab4593bf64beaab09ef2b1512acf11851cfa2d
@ -21,7 +21,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh
 ENV BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="6.8.19-debian-10-r19" \
+    BITNAMI_IMAGE_VERSION="6.8.19-debian-10-r20" \
    JAVA_HOME="/opt/bitnami/java" \
    LD_LIBRARY_PATH="/opt/bitnami/elasticsearch/jdk/lib:/opt/bitnami/elasticsearch/jdk/lib/server:$LD_LIBRARY_PATH"

--- a/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@ -22,9 +22,9 @@
    },
    "yq": {
        "arch": "amd64",
-        "digest": "83a1fc829033b78da3d99335556ecd7cda5f6265ded711d09d23966f72facd10",
+        "digest": "e8e4175266f100a9a74b9cbdcb44867581c4648d83735ed42e04c3fb89d38009",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "4.13.3-0"
+        "version": "4.13.4-0"
    }
 }
--- a/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/elasticsearch/6/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}'
 }
+
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t

 * [`7`, `7-debian-10`, `7.15.0`, `7.15.0-debian-10-r-1`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.15.0-debian-10-r-1/7/debian-10/Dockerfile)
 * [`7.10.2`, `7.10.2-debian-10`, `7.10.2-debian-10-r243` (7.10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.10.2-debian-10-r243/7.10.2/debian-10/Dockerfile)
-* [`6`, `6-debian-10`, `6.8.19`, `6.8.19-debian-10-r19` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.19-debian-10-r19/6/debian-10/Dockerfile)
+* [`6`, `6-debian-10`, `6.8.19`, `6.8.19-debian-10-r20` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.19-debian-10-r20/6/debian-10/Dockerfile)

 Subscribe to project updates by watching the [bitnami/elasticsearch GitHub repo](https://github.com/bitnami/bitnami-docker-elasticsearch).
 ## Get this image