From 0e986a89368e04cdadbfcb02369f5e389cd2f1b4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 22 Mar 2023 04:23:16 +0100 Subject: [PATCH] [bitnami/mariadb-galera] Release 10.9.5-debian-11-r14 (#28048) Signed-off-by: Bitnami Containers --- .../mariadb-galera/10.9/debian-11/Dockerfile | 10 ++--- .../opt/bitnami/.bitnami_components.json | 12 +++--- .../opt/bitnami/scripts/libservice.sh | 41 +++++++++++++++++-- .../opt/bitnami/scripts/libmariadbgalera.sh | 3 +- 4 files changed, 50 insertions(+), 16 deletions(-) diff --git a/bitnami/mariadb-galera/10.9/debian-11/Dockerfile b/bitnami/mariadb-galera/10.9/debian-11/Dockerfile index 25ddba149082..457fca456d38 100644 --- a/bitnami/mariadb-galera/10.9/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.9/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-15T17:56:20Z" \ + org.opencontainers.image.created="2023-03-22T02:28:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.9.5-debian-11-r13" \ + org.opencontainers.image.ref.name="10.9.5-debian-11-r14" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.9.5" @@ -22,9 +22,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat 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" \ - "mariadb-galera-10.9.5-3-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.9.5-4-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 \ diff --git a/bitnami/mariadb-galera/10.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b7f6808a1453..db6b55e941c0 100644 --- a/bitnami/mariadb-galera/10.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.9/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-galera": { "arch": "amd64", - "digest": "16b57215a0c3c019c3b46bad7d6f7eb1da9a418762ca4cd40f7602bdbafa08fd", + "digest": "c8b7484a3a1c380f232ff145ef1c9568ef06d6038c4cea82efe0e0a2568a9957", "distro": "debian-11", "type": "NAMI", - "version": "10.9.5-3" + "version": "10.9.5-4" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mariadb-galera/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/mariadb-galera/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/mariadb-galera/10.9/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" <