[bitnami/suitecrm] Release 7.13.2-debian-11-r2 (#32680)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2026-03-16 06:49:12 +08:00 · 2023-05-05 10:49:50 +01:00
parent 7a55f8c5a2
commit ca4750b7f4
15 changed files with 222 additions and 93 deletions
--- a/bitnami/suitecrm/7/debian-11/Dockerfile
+++ b/bitnami/suitecrm/7/debian-11/Dockerfile
@@ -2,11 +2,12 @@ FROM docker.io/bitnami/minideb:bullseye

 ARG TARGETARCH

-LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-05T21:01:44Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-05-05T09:12:12Z" \
      org.opencontainers.image.description="Application packaged by VMware, Inc" \
      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.13.2-debian-11-r1" \
+      org.opencontainers.image.ref.name="7.13.2-debian-11-r2" \
      org.opencontainers.image.title="suitecrm" \
      org.opencontainers.image.vendor="VMware, Inc." \
      org.opencontainers.image.version="7.13.2"
@@ -22,13 +23,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
    COMPONENTS=( \
-      "php-8.0.28-2-linux-${OS_ARCH}-debian-11" \
-      "apache-2.4.55-6-linux-${OS_ARCH}-debian-11" \
-      "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \
-      "libphp-8.0.28-2-linux-${OS_ARCH}-debian-11" \
+      "php-8.0.28-8-linux-${OS_ARCH}-debian-11" \
+      "apache-2.4.57-6-linux-${OS_ARCH}-debian-11" \
+      "mysql-client-10.11.2-5-linux-${OS_ARCH}-debian-11" \
+      "libphp-8.0.28-9-linux-${OS_ARCH}-debian-11" \
      "suitecrm-7.13.2-0-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \
    ) && \
    for COMPONENT in "${COMPONENTS[@]}"; do \
      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
--- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,49 +1,36 @@
 {
    "apache": {
        "arch": "amd64",
-        "digest": "85cad262b1568f5c507335dea52c7b311b157f15db13e88c4272a93410009abf",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "2.4.55-6"
-    },
-    "gosu": {
-        "arch": "amd64",
-        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
-        "distro": "debian-11",
-        "type": "NAMI",
-        "version": "1.16.0-2"
+        "version": "2.4.57-6"
    },
    "libphp": {
        "arch": "amd64",
-        "digest": "975e5e7663ae11b6b0f34ed8a589a5beb9589c0628f23890421a92143d9dfacc",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "8.0.28-2"
+        "version": "8.0.28-9"
    },
    "mysql-client": {
        "arch": "amd64",
-        "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "10.6.12-1"
+        "version": "10.11.2-5"
    },
    "php": {
        "arch": "amd64",
-        "digest": "9253bfece005a8afc80c15181035bec19fca8556b117ec8a6daa8321e4ec2f1e",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "8.0.28-2"
+        "version": "8.0.28-8"
    },
    "render-template": {
        "arch": "amd64",
-        "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.0.5-1"
+        "version": "1.0.5-5"
    },
    "suitecrm": {
        "arch": "amd64",
-        "digest": "9a91a5edbfadddba5ee56d699218d2c171dd580fd5b792d8b2f2fdd09f8a39ed",
        "distro": "debian-11",
        "type": "NAMI",
        "version": "7.13.2-0"
--- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -412,11 +412,16 @@ generate_random_string() {
    ascii)
        filter="[:print:]"
        ;;
+    numeric)
+        filter="0-9"
+        ;;
    alphanumeric)
        filter="a-zA-Z0-9"
        ;;
-    numeric)
-        filter="0-9"
+    alphanumeric+special|special+alphanumeric)
+        # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters
+        # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex
+        filter='a-zA-Z0-9!@#$%^'
        ;;
    *)
        echo "Invalid type ${type}" >&2
@@ -553,3 +558,98 @@ get_root_disk_device_id() {
 get_root_disk_size() {
    fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
 }
+
+########################
+# Run command as a specific user and group (optional)
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Returns:
+#   Exit code of the specified command
+#########################
+run_as_user() {
+    run_chroot "$@"
+}
+
+########################
+# Execute command as a specific user and group (optional),
+# replacing the current process image
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Returns:
+#   Exit code of the specified command
+#########################
+exec_as_user() {
+    run_chroot --replace-process "$@"
+}
+
+########################
+# Run a command using chroot
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Flags:
+#   -r | --replace-process - Replace the current process image (optional)
+# Returns:
+#   Exit code of the specified command
+#########################
+run_chroot() {
+    local userspec
+    local user
+    local homedir
+    local replace=false
+    local -r cwd="$(pwd)"
+
+    # Parse and validate flags
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            -r | --replace-process)
+                replace=true
+                ;;
+            --)
+                shift
+                break
+                ;;
+            -*)
+                stderr_print "unrecognized flag $1"
+                return 1
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
+
+    # Parse and validate arguments
+    if [[ "$#" -lt 2 ]]; then
+        echo "expected at least 2 arguments"
+        return 1
+    else
+        userspec=$1
+        shift
+
+        # userspec can optionally include the group, so we parse the user
+        user=$(echo "$userspec" | cut -d':' -f1)
+    fi
+
+    if ! am_i_root; then
+        error "Could not switch to '${userspec}': Operation not permitted"
+        return 1
+    fi
+
+    # Get the HOME directory for the user to switch, as chroot does
+    # not properly update this env and some scripts rely on it
+    homedir=$(eval echo "~${user}")
+    if [[ ! -d $homedir ]]; then
+        homedir="${HOME:-/}"
+    fi
+
+    # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion
+    if [[ "$replace" = true ]]; then
+        exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
+    else
+        chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
+    fi
+}
--- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -279,8 +279,10 @@ remove_logrotate_conf() {
 # Flags:
 #   --custom-service-content - Custom content to add to the [service] block
 #   --environment - Environment variable to define (multiple --environment options may be passed)
-#   --environment-file - Text file with environment variables
+#   --environment-file - Text file with environment variables (multiple --environment-file options may be passed)
 #   --exec-start - Start command (required)
+#   --exec-start-pre - Pre-start command (optional)
+#   --exec-start-post - Post-start command (optional)
 #   --exec-stop - Stop command (optional)
 #   --exec-reload - Reload command (optional)
 #   --group - System group to start the service with
@@ -292,6 +294,7 @@ remove_logrotate_conf() {
 #   --success-exit-status - Exit code that indicates a successful shutdown
 #   --type - Systemd unit type (defaults to forking)
 #   --user - System user to start the service with
+#   --working-directory - Working directory at which to start the service
 # Returns:
 #   None
 #########################
@@ -307,6 +310,8 @@ generate_systemd_conf() {
    local environment=""
    local environment_file=""
    local exec_start=""
+    local exec_start_pre=""
+    local exec_start_post=""
    local exec_stop=""
    local exec_reload=""
    local restart="always"
@@ -316,6 +321,7 @@ generate_systemd_conf() {
    local limits_content=""
    local success_exit_status=""
    local custom_service_content=""
+    local working_directory=""
    # Parse CLI flags
    shift
    while [[ "$#" -gt 0 ]]; do
@@ -324,7 +330,6 @@ generate_systemd_conf() {
            | --type \
            | --user \
            | --group \
-            | --environment-file \
            | --exec-start \
            | --exec-stop \
            | --exec-reload \
@@ -334,6 +339,7 @@ generate_systemd_conf() {
            | --standard-error \
            | --success-exit-status \
            | --custom-service-content \
+            | --working-directory \
            )
                var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                shift
@@ -345,11 +351,27 @@ generate_systemd_conf() {
                shift
                limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}"
                ;;
+            --exec-start-pre)
+                shift
+                [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n'
+                exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}"
+                ;;
+            --exec-start-post)
+                shift
+                [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n'
+                exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}"
+                ;;
            --environment)
                shift
                # It is possible to add multiple environment lines
                [[ -n "$environment" ]] && environment+=$'\n'
-                environment+="Environment=${1:?"environment" is missing}"
+                environment+="Environment=${1:?"--environment value is missing"}"
+                ;;
+            --environment-file)
+                shift
+                # It is possible to add multiple environment-file lines
+                [[ -n "$environment_file" ]] && environment_file+=$'\n'
+                environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}"
                ;;
            *)
                echo "Invalid command line flag ${1}" >&2
@@ -376,8 +398,21 @@ PartOf=bitnami.service

 [Service]
 Type=${type}
-ExecStart=${exec_start}
 EOF
+    if [[ -n "$working_directory" ]]; then
+        cat >> "$service_file" <<< "WorkingDirectory=${working_directory}"
+    fi
+    if [[ -n "$exec_start_pre" ]]; then
+        # This variable may contain multiple ExecStartPre= directives
+        cat >> "$service_file" <<< "$exec_start_pre"
+    fi
+    if [[ -n "$exec_start" ]]; then
+        cat >> "$service_file" <<< "ExecStart=${exec_start}"
+    fi
+    if [[ -n "$exec_start_post" ]]; then
+        # This variable may contain multiple ExecStartPost= directives
+        cat >> "$service_file" <<< "$exec_start_post"
+    fi
    # Optional stop and reload commands
    if [[ -n "$exec_stop" ]]; then
        cat >> "$service_file" <<< "ExecStop=${exec_stop}"
@@ -399,12 +434,14 @@ EOF
    if [[ -n "$restart" ]]; then
        cat >> "$service_file" <<< "Restart=${restart}"
    fi
-    # Environment flags (may be specified multiple times in a unit)
+    # Environment flags
    if [[ -n "$environment" ]]; then
+        # This variable may contain multiple Environment= directives
        cat >> "$service_file" <<< "$environment"
    fi
    if [[ -n "$environment_file" ]]; then
-        cat >> "$service_file" <<< "EnvironmentFile=${environment_file}"
+        # This variable may contain multiple EnvironmentFile= directives
+        cat >> "$service_file" <<< "$environment_file"
    fi
    # Logging
    if [[ -n "$standard_output" ]]; then
@@ -414,6 +451,7 @@ EOF
        cat >> "$service_file" <<< "StandardError=${standard_error}"
    fi
    if [[ -n "$custom_service_content" ]]; then
+        # This variable may contain multiple miscellaneous directives
        cat >> "$service_file" <<< "$custom_service_content"
    fi
    if [[ -n "$success_exit_status" ]]; then
@@ -424,7 +462,8 @@ EOF
    fi
    cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutSec=5min
+TimeoutStartSec=2min
+TimeoutStopSec=30s
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF
--- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,7 +112,11 @@ is_web_server_running() {
 #########################
 web_server_start() {
    info "Starting $(web_server_type) in background"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
+        systemctl start "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    fi
 }

 ########################
@@ -126,7 +130,11 @@ web_server_start() {
 #########################
 web_server_stop() {
    info "Stopping $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
+        systemctl stop "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    fi
 }

 ########################
@@ -140,7 +148,11 @@ web_server_stop() {
 #########################
 web_server_restart() {
    info "Restarting $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
+        systemctl restart "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    fi
 }

 ########################
@@ -153,7 +165,11 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
+        systemctl reload "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    fi
 }

 ########################
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt
@@ -1,17 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIICqDCCAZACCQCz8T3726LYsjANBgkqhkiG9w0BAQUFADAWMRQwEgYDVQQDDAtl
-eGFtcGxlLmNvbTAeFw0xMjExMTQxMTE4MjdaFw0yMjExMTIxMTE4MjdaMBYxFDAS
-BgNVBAMMC2V4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA5NHl5TfZtO6zugau2tp5mWIcQYJhuwKTmYeXDLYAGJpoD2SixwPL5c8glneI
-Rz1N2EQIZVeaWGbS0FLFlPdOkCkplpW9isYVC4XqKrk5b4HW4+YC+Cup0k+Kd4NM
-eZOTUvWr5N6dIpdibkVumBc/pao8VtdwywlCL/PwGRsQtkXrRICzdtRa3MXqTmEF
-foyVCGgBRtronlB9x4Plfb8Psk4GrPkjrWYgO8peKrl0O5+F+sYg7Gj95zCH73BQ
-ANzCVNrgD9fs9cyx3ru9CUdEoIxAAJwQFkjm7xr6xqhIlSgnQ7B0uOSTNRcXY6rw
-s+PxGneec/kRPRgzjC/QHY6n8QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBbyMqF
-RDsX8zX1EW5qA8AQ8Jb2XqWrVeSO8blMV3WagJ2airMm3+c/82FCwsd/cZ08UXhA
-/Kou0gi/F16tV26PiiUdp590Qao3d8H2qxc1rzzULimZPgxH4iA4vRyMHtyZN6h4
-7Fdn7O9xNMPu8siOz8rrzsEdEX5URbOMkDLCZsbTIUWVv2XmqrR0K10d5VuLWeLi
-r+4G6c6jpa244WmqT9ClqceJ12G1Wnmezy7ybiW0l5M2iuIKFEiRP5Hj0J15o1I2
-pXAbKysAdWRHsJSQOtcgO8Vh9k0wo3tKg4HDp1hbrEzoGzOv92Vjg3lG8X+hzbMJ
-MQURotHkD4Gk57wL
-----END CERTIFICATE-----
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key
@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA5NHl5TfZtO6zugau2tp5mWIcQYJhuwKTmYeXDLYAGJpoD2Si
-xwPL5c8glneIRz1N2EQIZVeaWGbS0FLFlPdOkCkplpW9isYVC4XqKrk5b4HW4+YC
-+Cup0k+Kd4NMeZOTUvWr5N6dIpdibkVumBc/pao8VtdwywlCL/PwGRsQtkXrRICz
-dtRa3MXqTmEFfoyVCGgBRtronlB9x4Plfb8Psk4GrPkjrWYgO8peKrl0O5+F+sYg
-7Gj95zCH73BQANzCVNrgD9fs9cyx3ru9CUdEoIxAAJwQFkjm7xr6xqhIlSgnQ7B0
-uOSTNRcXY6rws+PxGneec/kRPRgzjC/QHY6n8QIDAQABAoIBACo3G131tuGtpFTu
-xLW11vdYZXQklNlGuWp63IBI162yVv54B5wF9Ek6tH1uIiNaiREcRBxGVEB4/+3V
-R4SbN9Ba98RDbgu7TcipdTFaqOEMqFO1bNjSXWtip14zSBmqA2Ur1AHOnFj0awGD
-J8tBhsmOpcEz0Ch1VdO5ApPvLV8jH9wQiMI/Q6yYQMtmzTMCUMYdMqe+LOziIOzL
-oqN/WXnKL5E5TiO1bIxSpWPbT+IVn1c3/PShmvmRrLWsFUQlkwXJKMYZPO+rCCfe
-b+Q9lMLMnj+vOnM3z16WC3aiiJGCZjVTvQ+x22YrBTRPxZmHO2eZ4H/cUQM7Y/tw
-I7RjEM0CgYEA9Kxt1t8bWonzBii3P0rwyx0IECvg63k+pp4BpxpeWQKL7NVdSzk3
-AyJVcNjUoZgi2kVPdxzZGLrnZfuZ691xQB3oZF0LwBzQ4GFHkTRCB0s8ZA5lcJaI
-9pBu91bhz2VOZSTeQWpdMMURjXVyTXZInU1mwzmjVOIAYmO33shH9gcCgYEA72mX
-UoIrFPLkOTSZOb7UbjYH01vf6ThQiYCEWg7mD3CbY7n9oobIcQMzNnt7xN4wOl/V
-eKfZ7G56q8enfqm45Dyo9aCBCENVzmwO8wLe5UnvJBNL20KjvtwG8w5A6UZQzC7p
-3QS+U2zxVQNEeaE6a8Wrq2d1PlhVAHYw8odgNEcCgYBN38+58xrmrz99d1oTuAt5
-6kyVsRGOgPGS4HmQMRFUbT4R7DscZSKASd4945WRtTVqmWLYe4MRnvNlfzYXX0zb
-ZmmAAClsRP+qWuwHaEWXwrd+9SIOOqtvJrta1/lZJFpWUOy4j10H18Flb7sosnwc
-LPWHL4Iv0xriNfDg5Iga4wKBgQDLJBU59SkJBW+Q+oho7vrg6QeK15IOGbJ8eYfT
-woCC6VFwNQh5N1QsUELMH8rNKJpTba18SzAl5ThBOY9tciVnw/C5Og9CK6BLHnUw
-zWbDtxAq1BSxXsIB2EAtTBLX3MoB9myJFNVJhE7hi3w2mA8yEu+u6IIa/Ghjk+XE
-ZAnFUQKBgQDjMinRZrK5wA09jcetI+dNiLnKHoQG6OaXDDsNCatex0O2F36BvVXE
-P78qDz/i5aBMWsLx6VDvWJAkBIpZoNS5UsOn17tFaocGUSkcm48bs8Dn6VvsE8Bd
-XMPAHyKuILlKYifBvNq5T22KhqKX7yGmk/AeOOiKr2KeMnh27JYrCA==
-----END RSA PRIVATE KEY-----
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl
@@ -15,4 +15,3 @@ SetEnvIf X-Forwarded-Proto https HTTPS=on
  ErrorDocument 503 /503.html
 </VirtualHost>

-Include "{{APACHE_CONF_DIR}}/bitnami/bitnami-ssl.conf"
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh
@@ -50,6 +50,7 @@ apache_setup_bitnami_config() {
    done

    # Bitnami customizations
+    ensure_dir_exists "${APACHE_CONF_DIR}/bitnami"
    render-template "${template_dir}/bitnami.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf"
    render-template "${template_dir}/bitnami-ssl.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf"

--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh
@@ -8,6 +8,7 @@ set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purposes

 # Load libraries
+. /opt/bitnami/scripts/liblog.sh
 . /opt/bitnami/scripts/libapache.sh

 # Load Apache environment
@@ -19,6 +20,26 @@ apache_validate
 # Ensure Apache daemon user exists when running as 'root'
 am_i_root && ensure_user_exists "$APACHE_DAEMON_USER" --group "$APACHE_DAEMON_GROUP"

+# Generate SSL certs (without a passphrase)
+ensure_dir_exists "${APACHE_CONF_DIR}/bitnami/certs"
+if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then
+    info "Generating sample certificates"
+    SSL_KEY_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.key"
+    SSL_CERT_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.crt"
+    SSL_CSR_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.csr"
+    SSL_SUBJ="/CN=example.com"
+    SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1"
+    rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE"
+    openssl genrsa -out "$SSL_KEY_FILE" 4096
+    openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT"
+    openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT")
+    rm -f "$SSL_CSR_FILE"
+fi
+# Load SSL configuration
+if [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]] && [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then
+    ensure_apache_configuration_exists "Include \"${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf\"" "bitnami-ssl\.conf" "${APACHE_CONF_DIR}/bitnami/bitnami.conf"
+fi
+
 # Copy vhosts files
 if ! is_dir_empty "/vhosts"; then
    info "Found mounted virtual hosts in '/vhosts'. Copying them to '${APACHE_BASE_DIR}/conf/vhosts'"
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libapache.sh
@@ -237,18 +237,20 @@ is_apache_not_running() {
 # Arguments:
 #   $1 - configuration string
 #   $2 - pattern to use for checking if the configuration already exists (default: $1)
+#   $3 - Apache configuration file (default: $APACHE_CONF_FILE)
 # Returns:
 #   None
 ########################
 ensure_apache_configuration_exists() {
    local -r conf="${1:?conf missing}"
    local -r pattern="${2:-"$conf"}"
+    local -r conf_file="${3:-"$APACHE_CONF_FILE"}"
    # Enable configuration by appending to httpd.conf
-    if ! grep -E -q "$pattern" "$APACHE_CONF_FILE"; then
-        if is_file_writable "$APACHE_CONF_FILE"; then
-            cat >> "$APACHE_CONF_FILE" <<< "$conf"
+    if ! grep -E -q "$pattern" "$conf_file"; then
+        if is_file_writable "$conf_file"; then
+            cat >> "$conf_file" <<< "$conf"
        else
-            error "Could not add the following configuration to '${APACHE_CONF_FILE}:"
+            error "Could not add the following configuration to '${conf_file}:"
            error ""
            error "$(indent "$conf" 4)"
            error ""
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -239,7 +239,8 @@ mysql_execute_print_output() {
    if [[ -f "$DB_CONF_FILE" ]]; then
        args+=("--defaults-file=${DB_CONF_FILE}")
    fi
-    args+=("-N" "-u" "$user" "$db")
+    args+=("-N" "-u" "$user")
+    [[ -n "$db" ]] && args+=("$db")
    [[ -n "$pass" ]] && args+=("-p$pass")
    [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}")
    [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}")
@@ -446,6 +447,11 @@ mysql_stop() {
 mysql_install_db() {
    local command="${DB_BIN_DIR}/mysql_install_db"
    local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}")
+
+    # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable
+    read -r -a db_extra_flags <<< "$(mysql_extra_flags)"
+    [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}")
+
    am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
    if [[ "$DB_FLAVOR" = "mariadb" ]]; then
        args+=("--auth-root-authentication-method=normal")
@@ -488,7 +494,7 @@ mysql_upgrade() {
    else
        mysql_start_bg
        is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
-        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" --force
+        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
    fi
 }

--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libphp.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libphp.sh
@@ -87,6 +87,7 @@ php_set_runtime_config() {
    ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT" "$conf_file"
    ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE" "$conf_file"
    ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE" "$conf_file"
+    ! is_empty_value "$PHP_OUTPUT_BUFFERING" && info "Setting PHP output_buffering option" && php_conf_set output_buffering "$PHP_OUTPUT_BUFFERING" "$conf_file"

    true
 }
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libsuitecrm.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/libsuitecrm.sh
@@ -234,7 +234,7 @@ suitecrm_conf_set() {
    # Check if the configuration exists in the file
    if grep -q -E "$sanitized_pattern" "$SUITECRM_CONF_FILE"; then
        # It exists, so replace the line
-        replace_in_file "${SUITECRM_BASE_DIR}/config.php" "('${sanitized_pattern}' => ').*(',)" "\1${value}\2"
+        replace_in_file "$SUITECRM_CONF_FILE" "('${sanitized_pattern}' => ').*(',)" "\1${value}\2"
    else
        # The SuiteCRM configuration file includes all supported keys, but because of its format,
        # we cannot append contents to the end. We can assume thi
@@ -468,7 +468,7 @@ suitecrm_execute() {
    local -a cmd=("php" "${SUITECRM_BASE_DIR}/bin/console" "$@")
    # Run as web server user to avoid having to change permissions/ownership afterwards
    if am_i_root; then
-        debug_execute gosu "$WEB_SERVER_DAEMON_USER" "${cmd[@]}"
+        debug_execute run_as_user "$WEB_SERVER_DAEMON_USER" "${cmd[@]}"
    else
        debug_execute "${cmd[@]}"
    fi
--- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/php-env.sh
@@ -83,5 +83,6 @@ export PHP_MAX_INPUT_VARS="${PHP_MAX_INPUT_VARS:-}"
 export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}"
 export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}"
 export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}"
+export PHP_OUTPUT_BUFFERING="8196"

 # Custom environment variables may be defined below