diff --git a/bitnami/drupal-nginx/10/debian-11/Dockerfile b/bitnami/drupal-nginx/10/debian-11/Dockerfile index fb10ff102053..394b09f7b05d 100644 --- a/bitnami/drupal-nginx/10/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/10/debian-11/Dockerfile @@ -6,13 +6,13 @@ 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-20T22:21:09Z" \ + org.opencontainers.image.created="2023-07-13T11:00:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.0.9-debian-11-r16" \ + org.opencontainers.image.ref.name="10.1.1-debian-11-r0" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.0.9" + org.opencontainers.image.version="10.1.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -25,11 +25,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgeoip1 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 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 openssl procps unzip zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.1.20-1-linux-${OS_ARCH}-debian-11" \ + "php-8.2.8-1-linux-${OS_ARCH}-debian-11" \ "nginx-1.25.1-0-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-6-linux-${OS_ARCH}-debian-11" \ - "drupal-10.0.9-2-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \ + "drupal-10.1.1-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -50,7 +50,7 @@ RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -ENV APP_VERSION="10.0.9" \ +ENV APP_VERSION="10.1.1" \ BITNAMI_APP_NAME="drupal-nginx" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/drupal-nginx/10/debian-11/docker-compose.yml b/bitnami/drupal-nginx/10/debian-11/docker-compose.yml index 95605b6687f3..7e1092cb53bb 100644 --- a/bitnami/drupal-nginx/10/debian-11/docker-compose.yml +++ b/bitnami/drupal-nginx/10/debian-11/docker-compose.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + version: '2' services: mariadb: diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 447f7cd94b91..3e0dac172546 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.0.9-2" + "version": "10.1.1-0" }, "mysql-client": { "arch": "amd64", @@ -21,12 +21,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.20-1" + "version": "8.2.8-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-6" + "version": "1.0.5-7" } } \ No newline at end of file diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt index 8373a19703c6..76956b38e82c 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -1,3 +1,2 @@ -Bitnami containers ship with software bundles. You can find the licenses at: -https://bitnami.com/open-source +Bitnami containers ship with software bundles. You can find the licenses under: /opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 4242023f9415..184de8a117e2 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh index 41ebaf7464f6..63759c777f3b 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh index 801b9412bd99..96b22f99710c 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions @@ -42,7 +44,7 @@ ensure_dir_exists() { local owner_user="${2:-}" local owner_group="${3:-}" - mkdir -p "${dir}" + [ -d "${dir}" ] || mkdir -p "${dir}" if [[ -n $owner_user ]]; then owned_by "$dir" "$owner_user" "$owner_group" fi diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh index 9694852a7d25..dadd06149e00 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh index c7c0f6d4422a..2a9e76a4d725 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh index 8bbf165e3e2a..b47c69a56825 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for network functions diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 6d9ca8546eef..c0500acee78d 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 99df69681c27..af6af64d6dd0 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index d70cf0779ec8..107f54e6b5c9 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -104,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -131,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 @@ -187,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} @@ -391,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <