From 2180185b75f605bef2c6cdd1f6798305abd33fb0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 24 Feb 2023 00:31:28 +0100 Subject: [PATCH] [bitnami/osclass] Release 8.1.1-debian-11-r3 (#25277) Signed-off-by: Bitnami Containers --- bitnami/osclass/8/debian-11/Dockerfile | 10 +++--- .../opt/bitnami/.bitnami_components.json | 12 +++---- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/bitnami/osclass/8/debian-11/Dockerfile b/bitnami/osclass/8/debian-11/Dockerfile index 965f49359be3..0928401092d7 100644 --- a/bitnami/osclass/8/debian-11/Dockerfile +++ b/bitnami/osclass/8/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:35:47Z" \ + org.opencontainers.image.created="2023-02-23T22:57:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.1.1-debian-11-r2" \ + org.opencontainers.image.ref.name="8.1.1-debian-11-r3" \ org.opencontainers.image.title="osclass" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.1.1" @@ -22,10 +22,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.0.28-1-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.55-5-linux-${OS_ARCH}-debian-11" \ + "php-8.0.28-2-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.55-6-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.0.28-1-linux-${OS_ARCH}-debian-11" \ + "libphp-8.0.28-2-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ "osclass-8.1.1-1-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7f1dd7c85ed9..59ff063d642f 100644 --- a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "apache": { "arch": "amd64", - "digest": "a1afe61b7489ffb908895a02d0ce3b8771005a61489c35bef21101bb87b00a9d", + "digest": "85cad262b1568f5c507335dea52c7b311b157f15db13e88c4272a93410009abf", "distro": "debian-11", "type": "NAMI", - "version": "2.4.55-5" + "version": "2.4.55-6" }, "gosu": { "arch": "amd64", @@ -15,10 +15,10 @@ }, "libphp": { "arch": "amd64", - "digest": "d5aa0be40a79bb9f71d030c5d27636433f141bb6d7c237eafdffb2f01fcf17b7", + "digest": "975e5e7663ae11b6b0f34ed8a589a5beb9589c0628f23890421a92143d9dfacc", "distro": "debian-11", "type": "NAMI", - "version": "8.0.28-1" + "version": "8.0.28-2" }, "mysql-client": { "arch": "amd64", @@ -36,10 +36,10 @@ }, "php": { "arch": "amd64", - "digest": "7e8454fc4ee35df73f26bf09c9b5fe4dd130202dda3de42341facd900068a971", + "digest": "9253bfece005a8afc80c15181035bec19fca8556b117ec8a6daa8321e4ec2f1e", "distro": "debian-11", "type": "NAMI", - "version": "8.0.28-1" + "version": "8.0.28-2" }, "render-template": { "arch": "amd64", diff --git a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/osclass/8/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" <