From e7c8944d8217ae474613bbd965e39b0fb4170c44 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 23 Oct 2023 12:55:56 +0200
Subject: [PATCH] [bitnami/joomla] Release 5.0.0-debian-11-r1 (#52041)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/joomla/5/debian-11/Dockerfile         |  8 ++---
 .../opt/bitnami/.bitnami_components.json      |  4 +--
 .../rootfs/opt/bitnami/scripts/libjoomla.sh   | 35 ++++++-------------
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/bitnami/joomla/5/debian-11/Dockerfile b/bitnami/joomla/5/debian-11/Dockerfile
index c1f9321f8c89..6db1bc2d949e 100644
--- a/bitnami/joomla/5/debian-11/Dockerfile
+++ b/bitnami/joomla/5/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-10-19T21:06:01Z" \
+      org.opencontainers.image.created="2023-10-23T10:10:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.0.0-debian-11-r0" \
+      org.opencontainers.image.ref.name="5.0.0-debian-11-r1" \
       org.opencontainers.image.title="joomla" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.0.0"
@@ -28,10 +28,10 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \
       "apache-2.4.58-0-linux-${OS_ARCH}-debian-11" \
-      "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \
+      "mysql-client-11.1.2-2-linux-${OS_ARCH}-debian-11" \
       "libphp-8.1.24-1-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \
-      "joomla-5.0.0-0-linux-${OS_ARCH}-debian-11" \
+      "joomla-5.0.0-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index c84f9f048f3f..46e5e9107a98 100644
--- a/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "5.0.0-0"
+        "version": "5.0.0-1"
     },
     "libphp": {
         "arch": "amd64",
@@ -21,7 +21,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.1.2-0"
+        "version": "11.1.2-2"
     },
     "php": {
         "arch": "amd64",
diff --git a/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/libjoomla.sh b/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/libjoomla.sh
index 4a05c0fcc8b2..101ef1dad844 100644
--- a/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/libjoomla.sh
+++ b/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/libjoomla.sh
@@ -190,31 +190,16 @@ joomla_initialize() {
             local -r version_id="$(joomla_get_version_schema)"
             local -r encrypted_password="$(generate_md5_hash "${JOOMLA_PASSWORD}${salt}")"
             info "Executing initialization SQL commands"
-            if [[ "$(joomla_get_major_version)" -eq "4" ]]; then
-                echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/base.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/extensions.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/supports.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_users(id, name, username, email, password, block, sendEmail, registerDate, params) VALUES(42, 'Super User', '$JOOMLA_USERNAME', '$JOOMLA_EMAIL', '${encrypted_password}:${salt}', 0, 1, '0000-00-00 00:00:00', '')" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_user_usergroup_map(user_id, group_id) VALUES(42, 8)" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_schemas(extension_id, version_id) VALUES(700, '${version_id}')" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "UPDATE jos_extensions SET manifest_cache='{\"version\": \"$(joomla_get_version)\"}' WHERE name='files_joomla'" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                if ! is_boolean_yes "$JOOMLA_LOAD_SAMPLE_DATA"; then
-                    info "Disabling sample data"
-                    echo "UPDATE jos_extensions SET enabled='0' WHERE name LIKE '%sampledata%';" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                fi
-            else
-                echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/joomla.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_users(id, name, username, email, password, block, sendEmail, params) VALUES(42, 'Super User', '$JOOMLA_USERNAME', '$JOOMLA_EMAIL', '${encrypted_password}:${salt}', 0, 1, '')" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_user_usergroup_map(user_id, group_id) VALUES(42, 8)" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "DELETE FROM jos_utf8_conversion;" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_utf8_conversion(converted) VALUES(2)" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "INSERT INTO jos_schemas(extension_id, version_id) VALUES(700, '${version_id}')" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                echo "UPDATE jos_extensions SET manifest_cache='{\"version\": \"$(joomla_get_version)\"}' WHERE extension_id=700" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                if is_boolean_yes "$JOOMLA_LOAD_SAMPLE_DATA"; then
-                    info "Loading sample data"
-                    # Using source to avoid too much output
-                    echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/sample_data.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
-                fi
+            echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/base.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/extensions.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            echo "SOURCE ${JOOMLA_BASE_DIR}/installation/sql/mysql/supports.sql" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            echo "INSERT INTO jos_users(id, name, username, email, password, block, sendEmail, registerDate, params) VALUES(42, 'Super User', '$JOOMLA_USERNAME', '$JOOMLA_EMAIL', '${encrypted_password}:${salt}', 0, 1, '0000-00-00 00:00:00', '')" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            echo "INSERT INTO jos_user_usergroup_map(user_id, group_id) VALUES(42, 8)" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            echo "INSERT INTO jos_schemas(extension_id, version_id) VALUES(700, '${version_id}')" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            echo "UPDATE jos_extensions SET manifest_cache='{\"version\": \"$(joomla_get_version)\"}' WHERE name='files_joomla'" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
+            if ! is_boolean_yes "$JOOMLA_LOAD_SAMPLE_DATA"; then
+                info "Disabling sample data"
+                echo "UPDATE jos_extensions SET enabled='0' WHERE name LIKE '%sampledata%';" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass"
             fi
         else
             info "An already initialized Joomla! database was provided, configuration will be skipped"