[bitnami/mariadb] Release 10.3.38-debian-11-r13 (#28042)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

bitnami/mariadb/10.3/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-03-15T18:08:26Z" \
+      org.opencontainers.image.created="2023-03-22T02:15:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.3.38-debian-11-r12" \
+      org.opencontainers.image.ref.name="10.3.38-debian-11-r13" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.3.38"
@@ -22,9 +22,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "ini-file-1.4.5-1-linux-${OS_ARCH}-debian-11" \
+      "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \
-      "mariadb-10.3.38-1-linux-${OS_ARCH}-debian-11" \
+      "mariadb-10.3.38-2-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \

bitnami/mariadb/10.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -1,23 +1,23 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
+        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-2"
+        "version": "1.16.0-3"
     },
     "ini-file": {
         "arch": "amd64",
-        "digest": "75d5f74f62ca3a476e5ffc01715b197ba18c3b45a85b18fb61cc68e998616119",
+        "digest": "c75066994058575c6092fb760bd53feeb2aabd6039e942f3904de57f5a5534dc",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.4.5-1"
+        "version": "1.4.5-2"
     },
     "mariadb": {
         "arch": "amd64",
-        "digest": "19b38f5c7ec2a8a7e71f617599a5820cb00bcbdbb870e5a99c01df28d27cd933",
+        "digest": "51238fd258ac670ee62a5e6e5cb5d2e460be380123ab0de8e8fefebebec8f423",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "10.3.38-1"
+        "version": "10.3.38-2"
     }
 }

bitnami/mariadb/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh

@@ -281,6 +281,8 @@ remove_logrotate_conf() {
 #   --environment - Environment variable to define (multiple --environment options may be passed)
 #   --environment-file - Text file with environment variables
 #   --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
@@ -334,6 +340,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 +352,21 @@ 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"}"
                 ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
@@ -376,8 +393,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,8 +429,9 @@ 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
@@ -414,6 +445,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 +456,8 @@ EOF
     fi
     cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutSec=5min
+TimeoutStartSec=2min
+TimeoutStopSec=30s
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF

bitnami/mariadb/10.3/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh

@@ -516,7 +516,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[@]}")