From 203a19449635c6d64d8ed68e69c58484b98408f7 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 18 Mar 2023 23:57:34 +0100 Subject: [PATCH] [bitnami/ghost] Release 5.39.0-debian-11-r0 (#27632) Signed-off-by: Bitnami Containers --- bitnami/ghost/5/debian-11/Dockerfile | 18 ++++---- .../opt/bitnami/.bitnami_components.json | 20 ++++----- .../opt/bitnami/scripts/libservice.sh | 41 +++++++++++++++++-- .../opt/bitnami/scripts/libmysqlclient.sh | 8 +++- bitnami/ghost/5/debian-11/tags-info.yaml | 2 +- 5 files changed, 64 insertions(+), 25 deletions(-) diff --git a/bitnami/ghost/5/debian-11/Dockerfile b/bitnami/ghost/5/debian-11/Dockerfile index 70752d41ef6e..709a1b404c4d 100644 --- a/bitnami/ghost/5/debian-11/Dockerfile +++ b/bitnami/ghost/5/debian-11/Dockerfile @@ -3,13 +3,13 @@ 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-13T20:42:23Z" \ + org.opencontainers.image.created="2023-03-18T21:31:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.38.0-debian-11-r1" \ + org.opencontainers.image.ref.name="5.39.0-debian-11-r0" \ org.opencontainers.image.title="ghost" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.38.0" + org.opencontainers.image.version="5.39.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,11 +22,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl jq libaudit1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libicu67 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncurses6 libncursesw6 libnsl2 libpam0g libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 libxml2 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.8.16-7-linux-${OS_ARCH}-debian-11" \ - "node-16.19.1-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ - "ghost-5.38.0-0-linux-${OS_ARCH}-debian-11" \ + "python-3.8.16-8-linux-${OS_ARCH}-debian-11" \ + "node-16.19.1-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "ghost-5.39.0-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/ghost/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -ENV APP_VERSION="5.38.0" \ +ENV APP_VERSION="5.39.0" \ BITNAMI_APP_NAME="ghost" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/ghost/bin:$PATH" diff --git a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9a9624a0e424..c48ee3ffbbcc 100644 --- a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,37 +1,37 @@ { "ghost": { "arch": "amd64", - "digest": "a159afc69f970da1d909f897a1a7719d74c06b8ab700d944bcb6232cea106a81", + "digest": "aeef80e74deb14954429bf3e6e8d3189340dd7cb7d9ffd5915bc7d485a39c311", "distro": "debian-11", "type": "NAMI", - "version": "5.38.0-0" + "version": "5.39.0-0" }, "gosu": { "arch": "amd64", - "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", + "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-2" + "version": "1.16.0-3" }, "mysql-client": { "arch": "amd64", - "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853", + "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-1" + "version": "10.6.12-2" }, "node": { "arch": "amd64", - "digest": "af036d4ce8c216d61f662a522345caac4f4822fec1fdb2383302b5b1b9f2ffc9", + "digest": "984a00c0d1b2d456c942d8acbf7acca0aff455268bcf79bae9aa7cf00d95b1ba", "distro": "debian-11", "type": "NAMI", - "version": "16.19.1-1" + "version": "16.19.1-2" }, "python": { "arch": "amd64", - "digest": "a4249f456ce331010413d741375847593c983fba42e31eb6e042db931dedd9f1", + "digest": "faf2f2e22f3ae88f12fb973d60295f7d63fab48c6909ae351e88ee31c5d296c6", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-7" + "version": "3.8.16-8" } } \ No newline at end of file diff --git a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/ghost/5/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" <