From bf9cfc269ec36a06b14db8e3429079969040f65b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 23 Feb 2023 14:04:30 +0100 Subject: [PATCH] [bitnami/suitecrm] Release 7.13.1-debian-11-r5 (#24950) Signed-off-by: Bitnami Containers --- bitnami/suitecrm/7/debian-11/Dockerfile | 20 +++++------ .../opt/bitnami/.bitnami_components.json | 24 +++++++------- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- bitnami/suitecrm/7/debian-11/tags-info.yaml | 6 ++-- bitnami/suitecrm/README.md | 20 +++++------ 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/bitnami/suitecrm/7/debian-11/Dockerfile b/bitnami/suitecrm/7/debian-11/Dockerfile index 4d149505f14b..98e97abefae5 100644 --- a/bitnami/suitecrm/7/debian-11/Dockerfile +++ b/bitnami/suitecrm/7/debian-11/Dockerfile @@ -2,11 +2,11 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ - org.opencontainers.image.description="Application packaged by Bitnami" \ +LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-02-23T12:30:35Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.13.1-debian-11-r4" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/suitecrm" \ + org.opencontainers.image.ref.name="7.13.1-debian-11-r5" \ org.opencontainers.image.title="suitecrm" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.13.1" @@ -22,13 +22,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates cron 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.27-1-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.55-4-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.0.27-2-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-2-linux-${OS_ARCH}-debian-11" \ "suitecrm-7.13.1-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3a4133d3bafb..2b7a5f89a420 100644 --- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,45 +1,45 @@ { "apache": { "arch": "amd64", - "digest": "6937b37eaae1a0053c097ae04509cf3ccc4d260dd5fe010572753c3e8b22470d", + "digest": "85cad262b1568f5c507335dea52c7b311b157f15db13e88c4272a93410009abf", "distro": "debian-11", "type": "NAMI", - "version": "2.4.55-4" + "version": "2.4.55-6" }, "gosu": { "arch": "amd64", - "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b", + "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-1" + "version": "1.16.0-2" }, "libphp": { "arch": "amd64", - "digest": "501dfa639fb922301334755f68e8228303e4476ca033550d261ccfc7983ddf33", + "digest": "975e5e7663ae11b6b0f34ed8a589a5beb9589c0628f23890421a92143d9dfacc", "distro": "debian-11", "type": "NAMI", - "version": "8.0.27-2" + "version": "8.0.28-2" }, "mysql-client": { "arch": "amd64", - "digest": "f1d55c82fe67003513561ab0b4c91f2e7699d4eaaa5d417dc4ed6be50cb4cbed", + "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-0" + "version": "10.6.12-1" }, "php": { "arch": "amd64", - "digest": "eafa6d920509daf7b255e9b627af0e2ecaefd7c47169eafb0a8008e12855cadf", + "digest": "9253bfece005a8afc80c15181035bec19fca8556b117ec8a6daa8321e4ec2f1e", "distro": "debian-11", "type": "NAMI", - "version": "8.0.27-1" + "version": "8.0.28-2" }, "render-template": { "arch": "amd64", - "digest": "57c1d857acbb187fcb98f4ba26d138af9d866f59ad38dd443a75c0a6422de994", + "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-0" + "version": "1.0.5-1" }, "suitecrm": { "arch": "amd64", diff --git a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/suitecrm/7/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" <