From 574d1c52d63ef601be526460b02d76800dec23ca Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 30 Aug 2022 17:47:51 +0200
Subject: [PATCH] [bitnami/solr] Release 8.11.2-debian-11-r26 (#4654)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/solr/8/debian-11/Dockerfile           | 26 ++++++--
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libcomponent.sh       | 65 -------------------
 bitnami/solr/README.md                        |  2 +-
 4 files changed, 24 insertions(+), 71 deletions(-)
 delete mode 100644 bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh

diff --git a/bitnami/solr/8/debian-11/Dockerfile b/bitnami/solr/8/debian-11/Dockerfile
index 9399d55d0666..4cdeae753bdf 100644
--- a/bitnami/solr/8/debian-11/Dockerfile
+++ b/bitnami/solr/8/debian-11/Dockerfile
@@ -7,7 +7,7 @@ ENV HOME="/" \
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="8.11.2-debian-11-r25" \
+      org.opencontainers.image.ref.name="8.11.2-debian-11-r26" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/solr" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -17,9 +17,27 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libc6 lsof netcat-traditional procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.15-1-3" --checksum 7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "solr" "8.11.2-3" --checksum 03d6a059e8ca8ea9a046fd7f577fbb53c9b684ee52858d6370ecedb062d2da6a
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f java-11.0.15-1-3-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.15-1-3-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7  java-11.0.15-1-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf java-11.0.15-1-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf java-11.0.15-1-3-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f solr-8.11.2-4-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/solr-8.11.2-4-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "03d6a059e8ca8ea9a046fd7f577fbb53c9b684ee52858d6370ecedb062d2da6a  solr-8.11.2-4-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf solr-8.11.2-4-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf solr-8.11.2-4-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 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/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 92a30abd2dd9..0f7e4794ff50 100644
--- a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -18,6 +18,6 @@
         "digest": "03d6a059e8ca8ea9a046fd7f577fbb53c9b684ee52858d6370ecedb062d2da6a",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.11.2-3"
+        "version": "8.11.2-4"
     }
 }
\ No newline at end of file
diff --git a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
deleted file mode 100644
index a7b60696daa6..000000000000
--- a/bitnami/solr/8/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/solr/README.md b/bitnami/solr/README.md
index ccf373fea39d..7bac80ed3ad5 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -38,7 +38,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`9`, `9-debian-11`, `9.0.0`, `9.0.0-debian-11-r31`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/solr/9/debian-11/Dockerfile)
-* [`8`, `8-debian-11`, `8.11.2`, `8.11.2-debian-11-r25` (8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/solr/8/debian-11/Dockerfile)
+* [`8`, `8-debian-11`, `8.11.2`, `8.11.2-debian-11-r26` (8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/solr/8/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).