diff --git a/bitnami/ghost/5/debian-11/Dockerfile b/bitnami/ghost/5/debian-11/Dockerfile index 709a1b404c4d..93509725a93e 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-18T21:31:03Z" \ + org.opencontainers.image.created="2023-04-14T14:58:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.39.0-debian-11-r0" \ + org.opencontainers.image.ref.name="5.43.0-debian-11-r0" \ org.opencontainers.image.title="ghost" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.39.0" + org.opencontainers.image.version="5.43.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-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" \ + "python-3.8.16-9-linux-${OS_ARCH}-debian-11" \ + "node-16.20.0-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ + "ghost-5.43.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.39.0" \ +ENV APP_VERSION="5.43.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 c48ee3ffbbcc..9755d5b161f9 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,32 @@ { "ghost": { "arch": "amd64", - "digest": "aeef80e74deb14954429bf3e6e8d3189340dd7cb7d9ffd5915bc7d485a39c311", "distro": "debian-11", "type": "NAMI", - "version": "5.39.0-0" + "version": "5.43.0-0" }, "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "mysql-client": { "arch": "amd64", - "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-2" + "version": "10.6.12-4" }, "node": { "arch": "amd64", - "digest": "984a00c0d1b2d456c942d8acbf7acca0aff455268bcf79bae9aa7cf00d95b1ba", "distro": "debian-11", "type": "NAMI", - "version": "16.19.1-2" + "version": "16.20.0-1" }, "python": { "arch": "amd64", - "digest": "faf2f2e22f3ae88f12fb973d60295f7d63fab48c6909ae351e88ee31c5d296c6", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-8" + "version": "3.8.16-9" } } \ 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 2d4b7af6fd3a..d70cf0779ec8 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 @@ -279,7 +279,7 @@ 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) @@ -330,7 +330,6 @@ generate_systemd_conf() { | --type \ | --user \ | --group \ - | --environment-file \ | --exec-start \ | --exec-stop \ | --exec-reload \ @@ -368,6 +367,12 @@ generate_systemd_conf() { [[ -n "$environment" ]] && environment+=$'\n' 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 return 1 @@ -395,7 +400,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives @@ -435,7 +440,8 @@ EOF 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 diff --git a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..94745ebe419e 100644 --- a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/ghost/5/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 } ######################## diff --git a/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost-env.sh b/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost-env.sh index 673c71a04d93..4b79d5d8f4f7 100644 --- a/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost-env.sh +++ b/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost-env.sh @@ -77,7 +77,7 @@ export GHOST_BIN_DIR="${GHOST_BASE_DIR}/bin" export GHOST_LOG_FILE="${GHOST_BASE_DIR}/content/logs/ghost.log" export GHOST_CONF_FILE="${GHOST_BASE_DIR}/config.production.json" export GHOST_PID_FILE="${GHOST_BASE_DIR}/.ghostpid" -export PATH="${GHOST_BIN_DIR}:${PATH}" +export PATH="${GHOST_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${BITNAMI_ROOT_DIR}/node/bin:${PATH}" # Ghost persistence configuration export GHOST_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/ghost" diff --git a/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost/postunpack.sh b/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost/postunpack.sh index 0cc70b7b64b9..9698c2937876 100755 --- a/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost/postunpack.sh +++ b/bitnami/ghost/5/debian-11/rootfs/opt/bitnami/scripts/ghost/postunpack.sh @@ -30,12 +30,13 @@ declare -a writable_dirs=( "/.ghost" "${GHOST_BASE_DIR}/content/logs" ) + for dir in "${writable_dirs[@]}"; do ensure_dir_exists "$dir" # Use ghost:root ownership for compatibility when running as a non-root user # Due to a limitation in "ghost start" and "ghost doctor" commands which doesn't check # if the user has writing permissions properly, we need to set 777/666 permissions which - # is clearly a limitation in terms of security + # is clearly a limitation in terms of security configure_permissions_ownership "$dir" -d "777" -f "666" -u "$GHOST_DAEMON_USER" -g "root" done # Provide write permissions in installation directory (without doing it recursively) diff --git a/bitnami/ghost/5/debian-11/tags-info.yaml b/bitnami/ghost/5/debian-11/tags-info.yaml index e4417e0e2a14..9bdff30c0ed4 100644 --- a/bitnami/ghost/5/debian-11/tags-info.yaml +++ b/bitnami/ghost/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.39.0 +- 5.43.0 - latest