diff --git a/bitnami/suitecrm/8/debian-11/Dockerfile b/bitnami/suitecrm/8/debian-11/Dockerfile index 0d1e736aa3ec..25d0f1240c99 100644 --- a/bitnami/suitecrm/8/debian-11/Dockerfile +++ b/bitnami/suitecrm/8/debian-11/Dockerfile @@ -6,10 +6,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-06-27T07:36:17Z" \ + org.opencontainers.image.created="2023-06-30T08:32:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.3.0-debian-11-r13" \ + org.opencontainers.image.ref.name="8.3.0-debian-11-r14" \ org.opencontainers.image.title="suitecrm" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.3.0" @@ -30,7 +30,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \ "libphp-8.1.20-0-linux-${OS_ARCH}-debian-11" \ "suitecrm-8.3.0-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-6-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 \ diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 764826b0103d..33e7b00eaace 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -27,7 +27,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-6" + "version": "1.0.5-7" }, "suitecrm": { "arch": "amd64", diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 08fffa531ef1..107f54e6b5c9 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/suitecrm/8/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" <