From 4801444ebed396161560b72ca9c0d9ca9ccf37fe Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 Dec 2023 14:57:32 +0100 Subject: [PATCH] [bitnami/openresty] Release 1.21.4-3-debian-11-r2 (#53592) Signed-off-by: Bitnami Containers --- bitnami/openresty/1.21/debian-11/Dockerfile | 16 ++++++++-------- .../prebuildfs/opt/bitnami/scripts/libbitnami.sh | 10 +++++----- .../debian-11/prebuildfs/usr/sbin/run-script | 2 +- .../opt/bitnami/openresty/nginx/conf/nginx.conf | 2 +- bitnami/openresty/README.md | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bitnami/openresty/1.21/debian-11/Dockerfile b/bitnami/openresty/1.21/debian-11/Dockerfile index 82b4604834e4..91faf4f1c487 100644 --- a/bitnami/openresty/1.21/debian-11/Dockerfile +++ b/bitnami/openresty/1.21/debian-11/Dockerfile @@ -7,10 +7,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-11-04T07:40:11Z" \ + org.opencontainers.image.created="2023-12-02T08:44:19Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.21.4-3-debian-11-r0" \ + org.opencontainers.image.ref.name="1.21.4-3-debian-11-r2" \ org.opencontainers.image.title="openresty" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.21.4-3" @@ -21,20 +21,20 @@ ENV HOME="/home/openresty" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libcrypt1 libdeflate0 libexpat1 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgd3 libgeoip1 libgpg-error0 libicu67 libjbig0 libjpeg62-turbo liblzma5 libmd0 libpcre3 libpng16-16 libssl1.1 libstdc++6 libtiff5 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 libxpm4 libxslt1.1 libzstd1 perl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "openresty-1.21.4-3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e2..3853c789b2ea 100644 --- a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277e..b7a5bf1e50bf 100755 --- a/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf b/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf index e0c3edfd6d5d..f05340cf4800 100644 --- a/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf +++ b/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/openresty/README.md b/bitnami/openresty/README.md index cdf237576981..8e981e1a00b1 100644 --- a/bitnami/openresty/README.md +++ b/bitnami/openresty/README.md @@ -1,4 +1,4 @@ -# OpenResty packaged by Bitnami +# Bitnami package for OpenResty ## What is OpenResty? @@ -23,7 +23,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available.