From f3cdddd83b72f6eb3f2c57bf0f508a06e67badbb Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 22 Feb 2023 15:06:48 +0100 Subject: [PATCH] [bitnami/express] Release 4.18.2-debian-11-r47 (#24878) Signed-off-by: Bitnami Containers --- bitnami/express/4/debian-11/Dockerfile | 8 ++--- .../opt/bitnami/.bitnami_components.json | 6 ++-- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- bitnami/express/README.md | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/bitnami/express/4/debian-11/Dockerfile b/bitnami/express/4/debian-11/Dockerfile index 3b346ebe8185..e3791d3c9313 100644 --- a/bitnami/express/4/debian-11/Dockerfile +++ b/bitnami/express/4/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-02-21T07:48:34Z" \ + org.opencontainers.image.created="2023-02-22T13:45:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.18.2-debian-11-r46" \ + org.opencontainers.image.ref.name="4.18.2-debian-11-r47" \ org.opencontainers.image.title="express" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.18.2" @@ -22,10 +22,10 @@ RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libff RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "python-3.8.16-5-linux-${OS_ARCH}-debian-11" \ - "node-18.14.1-1-linux-${OS_ARCH}-debian-11" \ + "node-18.14.2-0-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ - "express-4.18.2-4-linux-${OS_ARCH}-debian-11" \ + "express-4.18.2-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2f5f4d6e4737..c65d5ac030c3 100644 --- a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -4,7 +4,7 @@ "digest": "c9d294177420a5958352dd9affe52bbdcc418631dcbb1cd132e6dc07e299446f", "distro": "debian-11", "type": "NAMI", - "version": "4.18.2-4" + "version": "4.18.2-5" }, "gosu": { "arch": "amd64", @@ -15,10 +15,10 @@ }, "node": { "arch": "amd64", - "digest": "d6828cad4303399275281eb1c617d87c315c65d0def58d1204fac426e0200b0a", + "digest": "7f2d4830add40c5bb11444044654340a4bc288c0b52ce766adcb1c446eece182", "distro": "debian-11", "type": "NAMI", - "version": "18.14.1-1" + "version": "18.14.2-0" }, "python": { "arch": "amd64", diff --git a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -305,6 +305,8 @@ generate_systemd_conf() { local exec_reload="" local restart="always" local pid_file="" + local standard_output="journal" + local standard_error="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -318,6 +320,8 @@ generate_systemd_conf() { | --exec-reload \ | --restart \ | --pid-file \ + | --standard-output \ + | --standard-error \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -362,36 +366,33 @@ ExecStart=${exec_start} EOF # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecStop=${exec_stop}" fi if [[ -n "$exec_reload" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecReload=${exec_reload}" fi # User and group if [[ -n "$user" ]]; then - cat >> "$service_file" <> "$service_file" <<< "User=${user}" fi if [[ -n "$group" ]]; then - cat >> "$service_file" <> "$service_file" <<< "Group=${group}" fi # PID file allows to determine if the main process is running properly (for Restart=always) if [[ -n "$pid_file" ]]; then - cat >> "$service_file" <> "$service_file" <<< "PIDFile=${pid_file}" fi # Environment flags (may be specified multiple times in a unit) if [[ -n "$environment" ]]; then cat >> "$service_file" <<< "$environment" fi + # Logging + if [[ -n "$standard_output" ]]; then + cat >> "$service_file" <<< "StandardOutput=${standard_output}" + fi + if [[ -n "$standard_error" ]]; then + cat >> "$service_file" <<< "StandardError=${standard_error}" + fi cat >> "$service_file" <