From fd4b278b19f65caae5bad6a8ec618479dc0e51b2 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 29 Aug 2022 12:42:48 +0200
Subject: [PATCH] [bitnami/jruby] Release 9.3.7-0-debian-11-r5 (#4385)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/jruby/9.3/debian-11/Dockerfile        | 46 ++++++++++++-------
 .../opt/bitnami/.bitnami_components.json      | 16 +++----
 bitnami/jruby/README.md                       |  2 +-
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/bitnami/jruby/9.3/debian-11/Dockerfile b/bitnami/jruby/9.3/debian-11/Dockerfile
index b3ac23865709..dcf7ff8825d5 100644
--- a/bitnami/jruby/9.3/debian-11/Dockerfile
+++ b/bitnami/jruby/9.3/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ENV OS_ARCH="amd64" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="9.3.7-0-debian-11-r4" \
+      org.opencontainers.image.ref.name="9.3.7-0-debian-11-r5" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jruby" \
       org.opencontainers.image.title="jruby" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -15,22 +15,34 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages build-essential ca-certificates curl git gzip libbrotli1 libbz2-1.0 libc6 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpsl5 libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libsqlite3-dev libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 pkg-config procps sqlite3 tar unzip wget zlib1g
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-3.8.13-165-linux-amd64-debian-11.tar.gz && \
-    echo "2bf41f60dccdcf65842d993083c2dcb27ab48a8a514fdeb1778e9b09f3e4a203  /tmp/bitnami/pkg/cache/python-3.8.13-165-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/python-3.8.13-165-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/python-3.8.13-165-linux-amd64-debian-11.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/node-14.20.0-2-linux-amd64-debian-11.tar.gz && \
-    echo "127f7b97bd46468ce62bc5cd9868371ca2c4c1e7201f6271a309b34a17b97d90  /tmp/bitnami/pkg/cache/node-14.20.0-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/node-14.20.0-2-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/node-14.20.0-2-linux-amd64-debian-11.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-11.0.15-1-2-linux-amd64-debian-11.tar.gz && \
-    echo "1a5468c7b552dfc8a33c5c9b214dbf7dd143a5f008cc3aa2e0418fab5eb16c5c  /tmp/bitnami/pkg/cache/java-11.0.15-1-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/java-11.0.15-1-2-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/java-11.0.15-1-2-linux-amd64-debian-11.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/jruby-9.3.7-0-2-linux-amd64-debian-11.tar.gz && \
-    echo "167fd6e6604dabe423e11abc5b58b16ac83cd835dd997eae9f9db42c2423f85d  /tmp/bitnami/pkg/cache/jruby-9.3.7-0-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/jruby-9.3.7-0-2-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/jruby-9.3.7-0-2-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f python-3.8.13-166-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/python-3.8.13-166-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "9a5fba755f6c8d60eacc80f366f3fbaa57d003913e48c31ba337037bb69e37b3  python-3.8.13-166-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf python-3.8.13-166-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf python-3.8.13-166-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f node-14.20.0-3-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/node-14.20.0-3-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "49946e0443d8f479f296c79589fea205126b6f6faa6b4474e5dd713b36d8167c  node-14.20.0-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf node-14.20.0-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf node-14.20.0-3-linux-amd64-debian-11.tar.gz
+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 --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 jruby-9.3.7-0-3-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/jruby-9.3.7-0-3-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "d3343580b9da3f182aacec819aadcf41482a82134e2cdc6ee190c70d7f3320fa  jruby-9.3.7-0-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf jruby-9.3.7-0-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf jruby-9.3.7-0-3-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 sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
diff --git a/bitnami/jruby/9.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jruby/9.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index a6af6883e800..2619e1d85ce6 100644
--- a/bitnami/jruby/9.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/jruby/9.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,30 +1,30 @@
 {
     "java": {
         "arch": "amd64",
-        "digest": "1a5468c7b552dfc8a33c5c9b214dbf7dd143a5f008cc3aa2e0418fab5eb16c5c",
+        "digest": "7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.15-1-2"
+        "version": "11.0.15-1-3"
     },
     "jruby": {
         "arch": "amd64",
-        "digest": "167fd6e6604dabe423e11abc5b58b16ac83cd835dd997eae9f9db42c2423f85d",
+        "digest": "d3343580b9da3f182aacec819aadcf41482a82134e2cdc6ee190c70d7f3320fa",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "9.3.7-0-2"
+        "version": "9.3.7-0-3"
     },
     "node": {
         "arch": "amd64",
-        "digest": "127f7b97bd46468ce62bc5cd9868371ca2c4c1e7201f6271a309b34a17b97d90",
+        "digest": "49946e0443d8f479f296c79589fea205126b6f6faa6b4474e5dd713b36d8167c",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "14.20.0-2"
+        "version": "14.20.0-3"
     },
     "python": {
         "arch": "amd64",
-        "digest": "2bf41f60dccdcf65842d993083c2dcb27ab48a8a514fdeb1778e9b09f3e4a203",
+        "digest": "9a5fba755f6c8d60eacc80f366f3fbaa57d003913e48c31ba337037bb69e37b3",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.13-165"
+        "version": "3.8.13-166"
     }
 }
\ No newline at end of file
diff --git a/bitnami/jruby/README.md b/bitnami/jruby/README.md
index 085932b1231a..48bdfe2f2474 100644
--- a/bitnami/jruby/README.md
+++ b/bitnami/jruby/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/).
 
 
-* [`9.3`, `9.3-debian-11`, `9.3.7-0`, `9.3.7-0-debian-11-r4`, `latest` (9.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jruby/9.3/debian-11/Dockerfile)
+* [`9.3`, `9.3-debian-11`, `9.3.7-0`, `9.3.7-0-debian-11-r5`, `latest` (9.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jruby/9.3/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).