diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile index 8d47965926b7..5b7c788e760f 100644 --- a/bitnami/discourse/3/debian-11/Dockerfile +++ b/bitnami/discourse/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-02-20T16:17:05Z" \ + org.opencontainers.image.created="2023-02-22T13:37:00Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.0.1-debian-11-r5" \ + org.opencontainers.image.ref.name="3.0.1-debian-11-r6" \ org.opencontainers.image.title="discourse" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.0.1" @@ -22,14 +22,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl advancecomp ca-certificates curl file gifsicle git hostname imagemagick jhead jpegoptim libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 optipng pngcrush pngquant procps rsync sqlite3 zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.8.16-4-linux-${OS_ARCH}-debian-11" \ + "python-3.8.16-5-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "ruby-3.1.3-3-linux-${OS_ARCH}-debian-11" \ + "ruby-3.1.3-4-linux-${OS_ARCH}-debian-11" \ "postgresql-client-15.2.0-1-linux-${OS_ARCH}-debian-11" \ - "node-18.14.1-1-linux-${OS_ARCH}-debian-11" \ - "brotli-1.0.9-156-linux-${OS_ARCH}-debian-11" \ + "node-18.14.2-0-linux-${OS_ARCH}-debian-11" \ + "brotli-1.0.9-157-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ - "discourse-3.0.1-1-linux-${OS_ARCH}-debian-11" \ + "discourse-3.0.1-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0452abb66b4e..cb2736d1da6d 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,17 +1,17 @@ { "brotli": { "arch": "amd64", - "digest": "5bdfaddf18d69cfcbcc9b02d12e92d874baa74aac3b8c647af4c43de9fd703c5", + "digest": "fe29860f4ae475f2413c79d8372cae7467d17bbe9350a611be9417459c5581c6", "distro": "debian-11", "type": "NAMI", - "version": "1.0.9-156" + "version": "1.0.9-157" }, "discourse": { "arch": "amd64", "digest": "b9c72bf2c2e54223c60adc9e7417fdb0a20aa1b2797da02b7475a8e8657595a8", "distro": "debian-11", "type": "NAMI", - "version": "3.0.1-1" + "version": "3.0.1-2" }, "gosu": { "arch": "amd64", @@ -22,10 +22,10 @@ }, "node": { "arch": "amd64", - "digest": "d6828cad4303399275281eb1c617d87c315c65d0def58d1204fac426e0200b0a", + "digest": "7f2d4830add40c5bb11444044654340a4bc288c0b52ce766adcb1c446eece182", "distro": "debian-11", "type": "NAMI", - "version": "18.14.1-1" + "version": "18.14.2-0" }, "postgresql-client": { "arch": "amd64", @@ -36,17 +36,17 @@ }, "python": { "arch": "amd64", - "digest": "100f7d546cffcd034bcced74a0fa87b5771c4109945a6ae616b53d0ec13d7881", + "digest": "e6ada4eebb80ec0bf135a4d0edd51b8e975939e2fea74e843b4eadae6a62d54f", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-4" + "version": "3.8.16-5" }, "ruby": { "arch": "amd64", - "digest": "8569375388a058f8cc6639a45b29b87d922c825f2879f13d16e6757a33787dbd", + "digest": "0fbaea59be89c93ea1b1dd88655bf2e24e96737b24356fd432b43257530eb1a6", "distro": "debian-11", "type": "NAMI", - "version": "3.1.3-3" + "version": "3.1.3-4" }, "wait-for-port": { "arch": "amd64", diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/discourse/3/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" <