From 9b57700730c3e85b201beabdec61f990b9fb08bf Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 1 Sep 2022 12:24:16 +0200
Subject: [PATCH] [bitnami/argo-cd] Release 2.4.11-debian-11-r0 (#4810)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/argo-cd/2/debian-11/Dockerfile        | 52 +++++++++++++--
 .../opt/bitnami/.bitnami_components.json      | 20 +++---
 .../opt/bitnami/scripts/libcomponent.sh       | 65 -------------------
 bitnami/argo-cd/2/debian-11/tags-info.yaml    |  5 ++
 bitnami/argo-cd/README.md                     |  2 +-
 5 files changed, 61 insertions(+), 83 deletions(-)
 delete mode 100644 bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
 create mode 100644 bitnami/argo-cd/2/debian-11/tags-info.yaml

diff --git a/bitnami/argo-cd/2/debian-11/Dockerfile b/bitnami/argo-cd/2/debian-11/Dockerfile
index 4efab22848f1..3fc3ebdff7c8 100644
--- a/bitnami/argo-cd/2/debian-11/Dockerfile
+++ b/bitnami/argo-cd/2/debian-11/Dockerfile
@@ -4,22 +4,60 @@ ENV HOME="/" \
     OS_FLAVOUR="debian-11" \
     OS_NAME="linux"
 
+LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
+      org.opencontainers.image.description="Application packaged by Bitnami" \
+      org.opencontainers.image.ref.name="2.4.11-debian-11-r0" \
+      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/argo-cd" \
+      org.opencontainers.image.title="argo-cd" \
+      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.version="2.4.11"
+
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages acl ca-certificates curl git git-lfs gnupg gzip libc6 procps tar ssh
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kustomize" "4.5.7-0" --checksum dbddb58d16fd55744dff6e0d295388a70531cd057f1cbc4e685216635a54c0ed
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ksonnet" "0.13.1-151" --checksum aae808c3b053381c23ca11ce24303a489129ff509c827f25e1ba4fce2797bb40
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "helm" "3.9.2-0" --checksum 48618accb2aad08762e8b5aadbe66f4a63fa449467038ed8629958ecf8f420db
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-152" --checksum 0c751c7e2ec0bc900a19dbec0306d6294fe744ddfb0fa64197ba1a36040092f0
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "argo-cd" "2.4.8-0" --checksum ca24c8196dace1244a2a1f02a3768ee7fc6b2a9d04eaf18ace6ac975f8d78866
+RUN install_packages acl ca-certificates curl git git-lfs gnupg gzip libc6 openssh-client procps tar
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f kustomize-4.5.7-2-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/kustomize-4.5.7-2-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "49f7301f564267ae9f7a89db86399f8c497180bbec7c097b9428ece71e1e6916  kustomize-4.5.7-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf kustomize-4.5.7-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf kustomize-4.5.7-2-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f ksonnet-0.13.1-153-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/ksonnet-0.13.1-153-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "9a09e8c678994d62acd0070b03161423ef396389e6848ac50b529d2f29bd811a  ksonnet-0.13.1-153-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf ksonnet-0.13.1-153-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf ksonnet-0.13.1-153-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f helm-3.9.4-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/helm-3.9.4-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "2f8d7916efa3f4c6005d08f9d68d1220c3f8960c0c1686d30245b70941827b7b  helm-3.9.4-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf helm-3.9.4-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf helm-3.9.4-1-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab  gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f argo-cd-2.4.11-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/argo-cd-2.4.11-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "13718c43bc4373541b164e4f12ced0bb67ff9ca53f13fd9fabb994d7c63c3db4  argo-cd-2.4.11-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf argo-cd-2.4.11-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf argo-cd-2.4.11-1-linux-amd64-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/argo-cd/postunpack.sh
-ENV APP_VERSION="2.4.8" \
+ENV APP_VERSION="2.4.11" \
     BITNAMI_APP_NAME="argo-cd" \
     PATH="/opt/bitnami/kustomize/bin:/opt/bitnami/ksonnet/bin:/opt/bitnami/helm/bin:/opt/bitnami/common/bin:/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:$PATH"
 
diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 76ca78442c12..b4069963185b 100644
--- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,37 +1,37 @@
 {
     "argo-cd": {
         "arch": "amd64",
-        "digest": "ca24c8196dace1244a2a1f02a3768ee7fc6b2a9d04eaf18ace6ac975f8d78866",
+        "digest": "13718c43bc4373541b164e4f12ced0bb67ff9ca53f13fd9fabb994d7c63c3db4",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.4.8-0"
+        "version": "2.4.11-1"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "0c751c7e2ec0bc900a19dbec0306d6294fe744ddfb0fa64197ba1a36040092f0",
+        "digest": "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.14.0-152"
+        "version": "1.14.0-154"
     },
     "helm": {
         "arch": "amd64",
-        "digest": "48618accb2aad08762e8b5aadbe66f4a63fa449467038ed8629958ecf8f420db",
+        "digest": "2f8d7916efa3f4c6005d08f9d68d1220c3f8960c0c1686d30245b70941827b7b",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.9.2-0"
+        "version": "3.9.4-1"
     },
     "ksonnet": {
         "arch": "amd64",
-        "digest": "aae808c3b053381c23ca11ce24303a489129ff509c827f25e1ba4fce2797bb40",
+        "digest": "9a09e8c678994d62acd0070b03161423ef396389e6848ac50b529d2f29bd811a",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "0.13.1-151"
+        "version": "0.13.1-153"
     },
     "kustomize": {
         "arch": "amd64",
-        "digest": "dbddb58d16fd55744dff6e0d295388a70531cd057f1cbc4e685216635a54c0ed",
+        "digest": "49f7301f564267ae9f7a89db86399f8c497180bbec7c097b9428ece71e1e6916",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.5.7-0"
+        "version": "4.5.7-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
deleted file mode 100644
index a7b60696daa6..000000000000
--- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Library for managing Bitnami components
-
-# Constants
-CACHE_ROOT="/tmp/bitnami/pkg/cache"
-DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith"
-
-# Functions
-
-########################
-# Download and unpack a Bitnami package
-# Globals:
-#   OS_NAME
-#   OS_ARCH
-#   OS_FLAVOUR
-# Arguments:
-#   $1 - component's name
-#   $2 - component's version
-# Returns:
-#   None
-#########################
-component_unpack() {
-    local name="${1:?name is required}"
-    local version="${2:?version is required}"
-    local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}"
-    local package_sha256=""
-    local directory="/opt/bitnami"
-
-    # Validate arguments
-    shift 2
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -c|--checksum)
-                shift
-                package_sha256="${1:?missing package checksum}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    echo "Downloading $base_name package"
-    if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then
-        echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download."
-        cp "${CACHE_ROOT}/${base_name}.tar.gz" .
-        rm "${CACHE_ROOT}/${base_name}.tar.gz"
-        if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then
-            echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-            package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")"
-            rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-        fi
-    else
-	curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz"
-    fi
-    if [ -n "$package_sha256" ]; then
-        echo "Verifying package integrity"
-        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || return "$?"
-    fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?"
-    rm "${base_name}.tar.gz"
-}
diff --git a/bitnami/argo-cd/2/debian-11/tags-info.yaml b/bitnami/argo-cd/2/debian-11/tags-info.yaml
new file mode 100644
index 000000000000..5425c7ac3afb
--- /dev/null
+++ b/bitnami/argo-cd/2/debian-11/tags-info.yaml
@@ -0,0 +1,5 @@
+rolling-tags:
+  - "2"
+  - "2-debian-11"
+  - "2.4.11"
+  - "latest"
diff --git a/bitnami/argo-cd/README.md b/bitnami/argo-cd/README.md
index ad3375d42698..c1589a94f3f5 100644
--- a/bitnami/argo-cd/README.md
+++ b/bitnami/argo-cd/README.md
@@ -35,7 +35,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-11`, `2.4.8`, `2.4.8-debian-11-r4`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/argo-cd/2/debian-11/      Dockerfile)
+* [`2`, `2-debian-11`, `2.4.11`, `2.4.11-debian-11-r0`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/argo-cd/2/debian-11/      Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).