From 251166ed8b92312fbfdd457ccdaf4c823b3b16f2 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 15 May 2023 14:27:05 +0100 Subject: [PATCH] [bitnami/java] Release 1.8.372-7-debian-11-r1 (#33776) Signed-off-by: Bitnami Containers --- .vib/java/goss/java.yaml | 5 +++-- bitnami/java/1.8/debian-11/Dockerfile | 10 +++++----- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- bitnami/java/1.8/debian-11/tags-info.yaml | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.vib/java/goss/java.yaml b/.vib/java/goss/java.yaml index 647c3b396bb9..7936b84e0f51 100644 --- a/.vib/java/goss/java.yaml +++ b/.vib/java/goss/java.yaml @@ -3,9 +3,10 @@ command: # We need to parse the printed version differently depending on the version: # - Major versions are often shown as "x" instead of "x.0.0" # - In Java 1.8, the printed version is 1.8.0_x, but $APP_VERSION is formated as 1.8.x - # - Versions are usually printed as x.y.z+b, but $APP_VERSION is formated as x.y.z-b + # - Versions are usually printed as x.y.z+b, but $APP_VERSION is formated as x.y.z-r + # - In Java 1.8, the version may also be printed as x.y.z-b0r or x.y.z-br check-app-version: - exec: java -version 2>&1 | sed "s/+/-/g" | sed "s/0_//g" | grep "$(echo $APP_VERSION | sed -E 's|([0-9]+)\.0[\.0]?$|\1|g')" + exec: java -version 2>&1 | sed -E -e "s/\+/-/g" -e "s/0_//g" -e "s/-b0?/-/g" | grep "$(echo $APP_VERSION | sed -E 's|([0-9]+)\.0[\.0]?$|\1|g')" exit-status: 0 check-run-jar: exec: java -jar ./java/goss/testfiles/HelloTest.jar diff --git a/bitnami/java/1.8/debian-11/Dockerfile b/bitnami/java/1.8/debian-11/Dockerfile index d4a313faa95e..62340ccfbeee 100644 --- a/bitnami/java/1.8/debian-11/Dockerfile +++ b/bitnami/java/1.8/debian-11/Dockerfile @@ -4,13 +4,13 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-08T19:13:39Z" \ + org.opencontainers.image.created="2023-05-14T11:12:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.8.362-debian-11-r35" \ + org.opencontainers.image.ref.name="1.8.372-7-debian-11-r1" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.8.362" + org.opencontainers.image.version="1.8.372-7" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ @@ -22,7 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libfontconfig libgcc-s1 libsqlite3-dev libssl-dev locales procps wget RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-1.8.362-4-linux-${OS_ARCH}-debian-11" \ + "java-1.8.372-7-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -47,7 +47,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/locales/add-extra-locales.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="1.8.362" \ +ENV APP_VERSION="1.8.372-7" \ BITNAMI_APP_NAME="java" \ JAVA_HOME="/opt/bitnami/java" \ LANG="en_US.UTF-8" \ diff --git a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d3dd300e8552..4a9e0cbdb875 100644 --- a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.8.362-4" + "version": "1.8.372-7-0" } } \ No newline at end of file diff --git a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 02c989d693ae..6d9ca8546eef 100644 --- a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -421,7 +421,7 @@ generate_random_string() { alphanumeric+special|special+alphanumeric) # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex - filter='a-zA-Z0-9!@#$%^' + filter='a-zA-Z0-9:@.,/+!=' ;; *) echo "Invalid type ${type}" >&2 diff --git a/bitnami/java/1.8/debian-11/tags-info.yaml b/bitnami/java/1.8/debian-11/tags-info.yaml index 39a6187436e8..9cd090c62b53 100644 --- a/bitnami/java/1.8/debian-11/tags-info.yaml +++ b/bitnami/java/1.8/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "1.8" - 1.8-debian-11 -- 1.8.362 +- 1.8.372-7