From bf45b462812d610d7b19a74197cca03f645b156d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 30 Jun 2023 00:18:35 +0200
Subject: [PATCH] [bitnami/wordpress-nginx] Release 6.2.2-debian-11-r21
 (#39297)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 .../wordpress-nginx/6/debian-11/Dockerfile    |  8 +++----
 .../opt/bitnami/.bitnami_components.json      |  4 ++--
 .../opt/bitnami/scripts/libservice.sh         | 22 ++++++++++++++-----
 .../wordpress/bitnami-templates/wp.tpl        |  2 ++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/bitnami/wordpress-nginx/6/debian-11/Dockerfile b/bitnami/wordpress-nginx/6/debian-11/Dockerfile
index b864fb2b9b22..2155fb3711e0 100644
--- a/bitnami/wordpress-nginx/6/debian-11/Dockerfile
+++ b/bitnami/wordpress-nginx/6/debian-11/Dockerfile
@@ -6,10 +6,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-06-27T06:05:38Z" \
+      org.opencontainers.image.created="2023-06-29T21:25:51Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.2.2-debian-11-r20" \
+      org.opencontainers.image.ref.name="6.2.2-debian-11-r21" \
       org.opencontainers.image.title="wordpress-nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.2.2"
@@ -28,8 +28,8 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "php-8.2.7-3-linux-${OS_ARCH}-debian-11" \
       "nginx-1.25.1-0-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \
-      "wordpress-6.2.2-15-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-6-linux-${OS_ARCH}-debian-11" \
+      "wordpress-6.2.2-16-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 32725a1b6689..55ad29685339 100644
--- a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -21,12 +21,12 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.5-6"
+        "version": "1.0.5-7"
     },
     "wordpress": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "6.2.2-15"
+        "version": "6.2.2-16"
     }
 }
\ No newline at end of file
diff --git a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 08fffa531ef1..107f54e6b5c9 100644
--- a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -106,8 +106,6 @@ generate_cron_conf() {
     local schedule="* * * * *"
     local clean="true"
 
-    local clean="true"
-
     # Parse optional CLI flags
     shift 2
     while [[ "$#" -gt 0 ]]; do
@@ -133,7 +131,12 @@ generate_cron_conf() {
 
     mkdir -p /etc/cron.d
     if "$clean"; then
-        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+        cat > "/etc/cron.d/${service_name}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
+${schedule} ${run_as} ${cmd}
+EOF
     else
         echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
     fi
@@ -189,7 +192,10 @@ generate_monit_conf() {
 
     is_boolean_yes "$disabled" && conf_suffix=".disabled"
     mkdir -p "$monit_conf_dir"
-    cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 check process ${service_name}
   with pidfile "${pid_file}"
   start program = "${start_command}" with timeout 90 seconds
@@ -248,7 +254,10 @@ generate_logrotate_conf() {
     done
 
     mkdir -p "$logrotate_conf_dir"
-    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
+    cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 ${log_path} {
   ${period}
   rotate ${rotations}
@@ -393,6 +402,9 @@ generate_systemd_conf() {
     fi
     # Generate the Systemd unit
     cat > "$service_file" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 [Unit]
 Description=Bitnami service for ${name}
 # Starting/stopping the main bitnami service should cause the same effect for this service
diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/wp.tpl b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/wp.tpl
index 81b9f434a776..7a5b12b672c9 100644
--- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/wp.tpl
+++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/wp.tpl
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 export WP_CLI_CONFIG_PATH="{{WP_CLI_CONF_FILE}}"
 export WP_CLI_CACHE_DIR="{{WP_CLI_BASE_DIR}}/.cache"