From 45c52a8dda8c4d8eeaeb209f1a95318fa3a91f46 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 1 Sep 2023 10:42:16 +0200 Subject: [PATCH] [bitnami/ejbca] Release 7.11.0-debian-11-r192 (#46909) Signed-off-by: Bitnami Containers --- bitnami/ejbca/7/debian-11/Dockerfile | 6 ++--- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 8 +++---- .../debian-11/prebuildfs/usr/sbin/run-script | 24 +++++++++++++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100755 bitnami/ejbca/7/debian-11/prebuildfs/usr/sbin/run-script diff --git a/bitnami/ejbca/7/debian-11/Dockerfile b/bitnami/ejbca/7/debian-11/Dockerfile index 14a61290d607..b4b6f0734305 100644 --- a/bitnami/ejbca/7/debian-11/Dockerfile +++ b/bitnami/ejbca/7/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-08-22T10:28:04Z" \ + org.opencontainers.image.created="2023-09-01T07:13:38Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.11.0-debian-11-r191" \ + org.opencontainers.image.ref.name="7.11.0-debian-11-r192" \ org.opencontainers.image.title="ejbca" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.11.0" @@ -28,7 +28,7 @@ RUN install_packages acl ca-certificates curl libaio1 libaudit1 libcap-ng0 libgc RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "java-11.0.20-8-3-linux-${OS_ARCH}-debian-11" \ - "wildfly-26.1.3-13-linux-${OS_ARCH}-debian-11" \ + "wildfly-26.1.3-14-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ "ejbca-7.11.0-7-linux-${OS_ARCH}-debian-11" \ ) && \ diff --git a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d9abfbd1681b..a7a1e4375f18 100644 --- a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -21,6 +21,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "26.1.3-13" + "version": "26.1.3-14" } } \ No newline at end of file diff --git a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 54987abca42a..16183f62d080 100644 --- a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -4,7 +4,7 @@ # # Validation functions library -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2086 # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh @@ -203,7 +203,7 @@ validate_ipv6() { if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then stat=0 fi - return "$stat" + return $stat } ######################## @@ -223,7 +223,7 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return "$stat" + return $stat } ######################## @@ -242,7 +242,7 @@ validate_ip() { else stat=$(validate_ipv6 "$ip") fi - return "$stat" + return $stat } ######################## diff --git a/bitnami/ejbca/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ejbca/7/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 000000000000..4ca0f897277e --- /dev/null +++ b/bitnami/ejbca/7/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-n}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi