From 255a092272d4c0e4fc78aa6e2d29cae8fdb29fdf Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 24 Feb 2023 01:39:07 +0100 Subject: [PATCH] [bitnami/wordpress-nginx] Release 6.1.1-debian-11-r49 (#25305) Signed-off-by: Bitnami Containers --- bitnami/wordpress-nginx/6/debian-11/Dockerfile | 4 ++-- .../default-https-server-block.conf | 0 .../debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh | 2 +- .../6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/{server_blocks => bitnami-templates}/default-https-server-block.conf (100%) diff --git a/bitnami/wordpress-nginx/6/debian-11/Dockerfile b/bitnami/wordpress-nginx/6/debian-11/Dockerfile index 6e67fe22c777..9e742769d9a8 100644 --- a/bitnami/wordpress-nginx/6/debian-11/Dockerfile +++ b/bitnami/wordpress-nginx/6/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-02-22T17:58:46Z" \ + org.opencontainers.image.created="2023-02-23T23:31:19Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.1.1-debian-11-r48" \ + org.opencontainers.image.ref.name="6.1.1-debian-11-r49" \ org.opencontainers.image.title="wordpress-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.1.1" diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/server_blocks/default-https-server-block.conf b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf similarity index 100% rename from bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/server_blocks/default-https-server-block.conf rename to bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh index 0851efcbb934..c1862dbbea1b 100755 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh @@ -47,7 +47,7 @@ nginx_patch_httpoxy_vulnerability # Configure default HTTP port nginx_configure_port "$NGINX_DEFAULT_HTTP_PORT_NUMBER" # Configure default HTTPS port -nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" +nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf" # shellcheck disable=SC1091 diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh index 3fdc013c4b9a..8acc6a5cd422 100755 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh @@ -32,7 +32,7 @@ nginx_custom_init_scripts # Configure HTTPS port number if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_file_writable "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"; then - cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" + cp "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" fi # Initialize NGINX