diff --git a/bitnami/jasperreports/8/debian-11/Dockerfile b/bitnami/jasperreports/8/debian-11/Dockerfile index 1c87898d41bd..c2423f7ff3b9 100644 --- a/bitnami/jasperreports/8/debian-11/Dockerfile +++ b/bitnami/jasperreports/8/debian-11/Dockerfile @@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-02-21T07:59:11Z" \ + org.opencontainers.image.created="2023-02-23T18:52:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.1.0-debian-11-r56" \ + org.opencontainers.image.ref.name="8.1.0-debian-11-r57" \ org.opencontainers.image.title="jasperreports" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.1.0" @@ -24,7 +24,7 @@ RUN install_packages acl ca-certificates curl fontconfig git libaudit1 libbsd0 l RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "java-1.8.362-2-linux-${OS_ARCH}-debian-11" \ - "tomcat-9.0.71-9-linux-${OS_ARCH}-debian-11" \ + "tomcat-9.0.71-10-linux-${OS_ARCH}-debian-11" \ "postgresql-client-11.19.0-1-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1ff713815ec3..de2016cf9ed5 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -43,9 +43,9 @@ }, "tomcat": { "arch": "amd64", - "digest": "d53438a13604643eb6b60dc705d15b7755a55c6d2263d30fc2593b4385d5e735", + "digest": "b18d0ba26399d240f644935d1b2c36ddb87f436e71320b66246bc6a3f8ee8784", "distro": "debian-11", "type": "NAMI", - "version": "9.0.71-9" + "version": "9.0.71-10" } } \ No newline at end of file diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/jasperreports/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" <