diff --git a/bitnami/nats/2/debian-11/Dockerfile b/bitnami/nats/2/debian-11/Dockerfile index fdd308db9fe2..d5c7f9d86073 100644 --- a/bitnami/nats/2/debian-11/Dockerfile +++ b/bitnami/nats/2/debian-11/Dockerfile @@ -6,13 +6,13 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-12T06:38:30Z" \ + org.opencontainers.image.created="2023-07-13T23:07:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.19-debian-11-r7" \ + org.opencontainers.image.ref.name="2.9.20-debian-11-r0" \ org.opencontainers.image.title="nats" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.19" + org.opencontainers.image.version="2.9.20" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,11 +22,11 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl procps +RUN install_packages ca-certificates curl openssl procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \ - "nats-2.9.19-0-linux-${OS_ARCH}-debian-11" \ + "nats-2.9.20-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/nats/postunpack.sh -ENV APP_VERSION="2.9.19" \ +ENV APP_VERSION="2.9.20" \ BITNAMI_APP_NAME="nats" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/nats/bin:$PATH" diff --git a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b8d4c99595d4..79432a0369e0 100644 --- a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.19-0" + "version": "2.9.20-0" }, "render-template": { "arch": "amd64", diff --git a/bitnami/nats/2/debian-11/rootfs/opt/bitnami/scripts/libnats.sh b/bitnami/nats/2/debian-11/rootfs/opt/bitnami/scripts/libnats.sh index ac0e5eb8fe8b..5b8f3387f2a1 100644 --- a/bitnami/nats/2/debian-11/rootfs/opt/bitnami/scripts/libnats.sh +++ b/bitnami/nats/2/debian-11/rootfs/opt/bitnami/scripts/libnats.sh @@ -193,7 +193,12 @@ nats_initialize() { SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1" rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE" openssl genrsa -out "$SSL_KEY_FILE" 4096 - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" + # OpenSSL version 1.0.x does not use the same parameters as OpenSSL >= 1.1.x + if [[ "$(openssl version | grep -oE "[0-9]+\.[0-9]+")" == "1.0" ]]; then + openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" + else + openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" + fi openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") rm -f "$SSL_CSR_FILE" fi diff --git a/bitnami/nats/2/debian-11/tags-info.yaml b/bitnami/nats/2/debian-11/tags-info.yaml index 5af0b5f3ce4a..4ef657de03d6 100644 --- a/bitnami/nats/2/debian-11/tags-info.yaml +++ b/bitnami/nats/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.19 +- 2.9.20 - latest