From d3aa9cf06d8ece29b644dec8351e2b9ef856c3de Mon Sep 17 00:00:00 2001 From: jgournet Date: Mon, 11 Mar 2024 21:37:11 +1100 Subject: [PATCH] [bitnami/nginx] latest image: Read-only file system fix #63507 (#63519) * 63507: [bitnami/nginx] latest image: Read-only file system Signed-off-by: jgournet * Apply change to 1.24 too --------- Signed-off-by: jgournet --- .../debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh | 2 +- .../debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh index 8d39918d5b0e..a90b78b6e353 100755 --- a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh +++ b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh @@ -22,7 +22,7 @@ print_welcome_page # bypassing the setup.sh logic. If the file already exists do not overwrite (in # case someone mounts a configuration file in /opt/bitnami/nginx/conf) debug "Copying files from $NGINX_DEFAULT_CONF_DIR to $NGINX_CONF_DIR" -cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR" +cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR" || true if [[ "$1" = "/opt/bitnami/scripts/nginx/run.sh" ]]; then diff --git a/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh b/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh index 8d39918d5b0e..a90b78b6e353 100755 --- a/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh +++ b/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh @@ -22,7 +22,7 @@ print_welcome_page # bypassing the setup.sh logic. If the file already exists do not overwrite (in # case someone mounts a configuration file in /opt/bitnami/nginx/conf) debug "Copying files from $NGINX_DEFAULT_CONF_DIR to $NGINX_CONF_DIR" -cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR" +cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR" || true if [[ "$1" = "/opt/bitnami/scripts/nginx/run.sh" ]]; then