diff --git a/bitnami/jasperreports/8/debian-11/Dockerfile b/bitnami/jasperreports/8/debian-11/Dockerfile index 35b6505fd64a..fed4c0175f06 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-03-21T23:24:40Z" \ + org.opencontainers.image.created="2023-03-28T04:42:21Z" \ 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-r65" \ + org.opencontainers.image.ref.name="8.1.0-debian-11-r66" \ org.opencontainers.image.title="jasperreports" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.1.0" 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 645e992601c2..cbebf6fce3dd 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 @@ -1,49 +1,42 @@ { "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "jasperreports": { "arch": "amd64", - "digest": "d158b3e0b35c610c4b2fe7614d44b5e66baf45ce0a53b556804ebee1c09a3137", "distro": "debian-11", "type": "NAMI", "version": "8.1.0-5" }, "java": { "arch": "amd64", - "digest": "a01727685913db816e1db77cf4b3e5eeaec8bbba762a9c6d708d0749b2c6a75b", "distro": "debian-11", "type": "NAMI", "version": "1.8.362-3" }, "mysql-client": { "arch": "amd64", - "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", "distro": "debian-11", "type": "NAMI", "version": "10.6.12-2" }, "postgresql-client": { "arch": "amd64", - "digest": "96964382fa69960349a7e3253b76a2d8665f5e2a61e0708d7e42939ac877edb2", "distro": "debian-11", "type": "NAMI", "version": "11.19.0-2" }, "render-template": { "arch": "amd64", - "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b", "distro": "debian-11", "type": "NAMI", "version": "1.0.5-2" }, "tomcat": { "arch": "amd64", - "digest": "fa0c590c144b438a5361a349047891d81915c4a9bbc2a9ba64b91d3df80d9316", "distro": "debian-11", "type": "NAMI", "version": "9.0.73-1" 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 2d4b7af6fd3a..6fcb304d34cc 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 @@ -395,7 +395,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + fi } ########################