From bee179d7a1ba19f9cb555651172bea29137461b6 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 29 Aug 2022 22:17:40 +0200
Subject: [PATCH] [bitnami/haproxy-intel] Release 2.6.4-debian-11-r2 (#4493)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/haproxy-intel/2/debian-11/Dockerfile  | 37 ++++++++++++-------
 .../opt/bitnami/.bitnami_components.json      | 12 +++---
 bitnami/haproxy-intel/README.md               |  2 +-
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/bitnami/haproxy-intel/2/debian-11/Dockerfile b/bitnami/haproxy-intel/2/debian-11/Dockerfile
index 276c2778b86e..98927478e58b 100644
--- a/bitnami/haproxy-intel/2/debian-11/Dockerfile
+++ b/bitnami/haproxy-intel/2/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME="/" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.6.4-debian-11-r1" \
+      org.opencontainers.image.ref.name="2.6.4-debian-11-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/haproxy-intel" \
       org.opencontainers.image.title="haproxy-intel" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -15,19 +15,28 @@ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl gzip libc6 libssl1.1 procps tar wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/qatengine-0.6.14-1-linux-amd64-debian-11.tar.gz && \
-    echo "e54efe09faa1e3fe55bada6f178341670d423bc928669e17e33d7416202e14e2  /tmp/bitnami/pkg/cache/qatengine-0.6.14-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/qatengine-0.6.14-1-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/qatengine-0.6.14-1-linux-amd64-debian-11.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/haproxy-dataplaneapi-2.6.0-1-linux-amd64-debian-11.tar.gz && \
-    echo "f95fb721441bf02fe10754c5c87400d1877016d5a812d78e60477fe8b948b94c  /tmp/bitnami/pkg/cache/haproxy-dataplaneapi-2.6.0-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/haproxy-dataplaneapi-2.6.0-1-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/haproxy-dataplaneapi-2.6.0-1-linux-amd64-debian-11.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/haproxy-2.6.4-0-linux-amd64-debian-11.tar.gz && \
-    echo "5faeeed5f47bcf01cb88e2ed3c69d07182373f8d27ee7a3706da2cfcc8b23639  /tmp/bitnami/pkg/cache/haproxy-2.6.4-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/haproxy-2.6.4-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/haproxy-2.6.4-0-linux-amd64-debian-11.tar.gz
+RUN install_packages ca-certificates curl gzip libc6 libssl1.1 procps tar
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f qatengine-0.6.15-0-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/qatengine-0.6.15-0-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "9c0e33d7f8d76f959ae54375c7b813db088791601f8c1cb7e3e9dcbcaea70bde  qatengine-0.6.15-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf qatengine-0.6.15-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf qatengine-0.6.15-0-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f haproxy-dataplaneapi-2.6.0-2-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/haproxy-dataplaneapi-2.6.0-2-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "22519edc1bfeef288ad7665f2b9ff6dc9c2a9820f53ebf800aea2aa64e8f58f4  haproxy-dataplaneapi-2.6.0-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf haproxy-dataplaneapi-2.6.0-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf haproxy-dataplaneapi-2.6.0-2-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f haproxy-2.6.4-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/haproxy-2.6.4-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "ee9269a73635c2976e1e587c5ff6c345b081b51d076855b3ce35c5209a94210e  haproxy-2.6.4-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf haproxy-2.6.4-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf haproxy-2.6.4-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
diff --git a/bitnami/haproxy-intel/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/haproxy-intel/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 56efca3f27b5..d736e1c83ca1 100644
--- a/bitnami/haproxy-intel/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/haproxy-intel/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,23 +1,23 @@
 {
     "haproxy": {
         "arch": "amd64",
-        "digest": "5faeeed5f47bcf01cb88e2ed3c69d07182373f8d27ee7a3706da2cfcc8b23639",
+        "digest": "ee9269a73635c2976e1e587c5ff6c345b081b51d076855b3ce35c5209a94210e",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.6.4-0"
+        "version": "2.6.4-1"
     },
     "haproxy-dataplaneapi": {
         "arch": "amd64",
-        "digest": "f95fb721441bf02fe10754c5c87400d1877016d5a812d78e60477fe8b948b94c",
+        "digest": "22519edc1bfeef288ad7665f2b9ff6dc9c2a9820f53ebf800aea2aa64e8f58f4",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.6.0-1"
+        "version": "2.6.0-2"
     },
     "qatengine": {
         "arch": "amd64",
-        "digest": "e54efe09faa1e3fe55bada6f178341670d423bc928669e17e33d7416202e14e2",
+        "digest": "9c0e33d7f8d76f959ae54375c7b813db088791601f8c1cb7e3e9dcbcaea70bde",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "0.6.14-1"
+        "version": "0.6.15-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/haproxy-intel/README.md b/bitnami/haproxy-intel/README.md
index b981eea98add..583857d21714 100644
--- a/bitnami/haproxy-intel/README.md
+++ b/bitnami/haproxy-intel/README.md
@@ -35,7 +35,7 @@ Optimized containers fully leverage 3rd gen Intel(R) Xeon(R) Scalable Processor
 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.6.4`, `2.6.4-debian-11-r1`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/haproxy-intel/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.6.4`, `2.6.4-debian-11-r2`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/haproxy-intel/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).