From 64dd0cce51c8313896dcf1fb4cb28a03215e739c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 7 Oct 2022 04:16:25 +0200
Subject: [PATCH] [bitnami/logstash] Release 8.4.3-debian-11-r0 (#9246)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/logstash/8/debian-11/Dockerfile       | 55 +++++++------------
 .../opt/bitnami/.bitnami_components.json      | 16 +++---
 bitnami/logstash/8/debian-11/tags-info.yaml   |  2 +-
 bitnami/logstash/README.md                    |  2 +-
 4 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/bitnami/logstash/8/debian-11/Dockerfile b/bitnami/logstash/8/debian-11/Dockerfile
index c473058305d0..2f94d1322d1a 100644
--- a/bitnami/logstash/8/debian-11/Dockerfile
+++ b/bitnami/logstash/8/debian-11/Dockerfile
@@ -5,11 +5,11 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="8.4.2-debian-11-r4" \
+      org.opencontainers.image.ref.name="8.4.3-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \
       org.opencontainers.image.title="logstash" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="8.4.2"
+      org.opencontainers.image.version="8.4.3"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -21,45 +21,30 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz yq-4.27.5-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz logstash-8.4.2-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN apt-get update && apt-get upgrade -y && \
+    COMPONENTS=( \
+      "java-11.0.16-1-linux-${OS_ARCH}-debian-11" \
+      "yq-4.28.1-1-linux-${OS_ARCH}-debian-11" \
+      "logstash-8.4.3-1-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
+    ) && \
+    for COMPONENT in "${COMPONENTS[@]}"; do \
+      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
+        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
+        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
+      fi && \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+      rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
+    done
+RUN apt-get autoremove --purge -y curl && \
+    apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/logstash/postunpack.sh
-ENV APP_VERSION="8.4.2" \
+ENV APP_VERSION="8.4.3" \
     BITNAMI_APP_NAME="logstash" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/logstash/bin:$PATH"
diff --git a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index c516fffb9755..3bcf9f27bfe6 100644
--- a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,30 +1,30 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab",
+        "digest": "f21869b27c26b9c3053bce8b419a0fdf1dc45fcf13a7c2058e0afb6996d3687f",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.14.0-154"
+        "version": "1.14.0-155"
     },
     "java": {
         "arch": "amd64",
-        "digest": "98cbaca6fc1aca76fdbfc11ee57d05924adc956401396375c4be43c5c671dca5",
+        "digest": "c375579c55ee13d9561dcfaeba0338a6c2f5233dc386ead63dbbb67cc974fcdb",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.16-0"
+        "version": "11.0.16-1"
     },
     "logstash": {
         "arch": "amd64",
-        "digest": "c52337f07f83dd98c29ac6b0e04723632178de005429f1675345b6fbfad838de",
+        "digest": "9159e6b819bd7571f9f0e3fd9a1f8b8230d00f82da8cc0be1b2ebfc5ee8012b1",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.4.2-0"
+        "version": "8.4.3-1"
     },
     "yq": {
         "arch": "amd64",
-        "digest": "ba43314727b7797557eee675a9e3cd4bf1d396c0b1fcce544e828ca9521256e6",
+        "digest": "d4700bc42fd4a0ceb9981c1f1b7868c03db743cabc2275ebc1bf1fe7df897b9a",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.27.5-0"
+        "version": "4.28.1-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/logstash/8/debian-11/tags-info.yaml b/bitnami/logstash/8/debian-11/tags-info.yaml
index 96d1083b52fd..2999806380d2 100644
--- a/bitnami/logstash/8/debian-11/tags-info.yaml
+++ b/bitnami/logstash/8/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "8"
   - "8-debian-11"
-  - "8.4.2"
+  - "8.4.3"
   - "latest"
diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md
index cf4ef6c2a271..556521aa6561 100644
--- a/bitnami/logstash/README.md
+++ b/bitnami/logstash/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/).
 
 
-* [`8`, `8-debian-11`, `8.4.2`, `8.4.2-debian-11-r4`, `latest` (8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/logstash/8/debian-11/Dockerfile)
+* [`8`, `8-debian-11`, `8.4.3`, `8.4.3-debian-11-r0`, `latest` (8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/logstash/8/debian-11/Dockerfile)
 * [`7`, `7-debian-11`, `7.17.6`, `7.17.6-debian-11-r14` (7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/logstash/7/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).