diff --git a/bitnami/reportserver/4/debian-11/Dockerfile b/bitnami/reportserver/4/debian-11/Dockerfile index dff2d8f10642..c32cd9f30724 100644 --- a/bitnami/reportserver/4/debian-11/Dockerfile +++ b/bitnami/reportserver/4/debian-11/Dockerfile @@ -7,13 +7,13 @@ 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-06-27T05:38:03Z" \ + org.opencontainers.image.created="2023-06-28T18:03:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.6.1-6092-debian-11-r10" \ + org.opencontainers.image.ref.name="4.6.1-6094-debian-11-r0" \ org.opencontainers.image.title="reportserver" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.6.1-6092" + org.opencontainers.image.version="4.6.1-6094" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -29,8 +29,8 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "java-17.0.7-7-2-linux-${OS_ARCH}-debian-11" \ "tomcat-9.0.76-0-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \ - "reportserver-4.6.1-6092-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-6-linux-${OS_ARCH}-debian-11" \ + "reportserver-4.6.1-6094-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -51,7 +51,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh RUN /opt/bitnami/scripts/reportserver/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="4.6.1-6092" \ +ENV APP_VERSION="4.6.1-6094" \ BITNAMI_APP_NAME="reportserver" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" \ diff --git a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a1b5f7865547..659dec2f0e28 100644 --- a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,13 +15,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-6" + "version": "1.0.5-7" }, "reportserver": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.6.1-6092-0" + "version": "4.6.1-6094-0" }, "tomcat": { "arch": "amd64", diff --git a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 08fffa531ef1..107f54e6b5c9 100644 --- a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -106,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -133,7 +131,12 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then - echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" + cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" fi @@ -189,7 +192,10 @@ generate_monit_conf() { is_boolean_yes "$disabled" && conf_suffix=".disabled" mkdir -p "$monit_conf_dir" - cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <"${logrotate_conf_dir}/${service_name}" + cat < "${logrotate_conf_dir}/${service_name}" +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ${log_path} { ${period} rotate ${rotations} @@ -393,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <