diff --git a/bitnami/drupal-nginx/9/debian-10/Dockerfile b/bitnami/drupal-nginx/9/debian-10/Dockerfile index 03df5ec1fbe3..26f5baf6296e 100644 --- a/bitnami/drupal-nginx/9/debian-10/Dockerfile +++ b/bitnami/drupal-nginx/9/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl dirmngr gnupg gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 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 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 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 procps tar unzip zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.25-1" --checksum fb835d2deaeaf6c583ec498ff4b9f985aa022367704c9e4cbdb6dd2e0d154ec0 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.25-2" --checksum db87da20d87bed33da03a47847b2b4fe24dad2723772ea3a0f027eb2e4dee0c0 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx" "1.21.3-0" --checksum 2e36afe1b4930d427d96b8321d919202751933a109cdd260fee432730342994a RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.31-2" --checksum 15b394a022ca1d0b4b89bfee0487ee13f9e8cc697d0ca09ce62a0a3732536236 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe @@ -18,14 +18,14 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.2.7-0 RUN chmod g+rwX /opt/bitnami COPY rootfs / -RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/nginx/postunpack.sh +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 ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="drupal-nginx" \ - BITNAMI_IMAGE_VERSION="9.2.7-debian-10-r24" \ + BITNAMI_IMAGE_VERSION="9.2.7-debian-10-r25" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 437a95997262..124eb7a415e3 100644 --- a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "fb835d2deaeaf6c583ec498ff4b9f985aa022367704c9e4cbdb6dd2e0d154ec0", + "digest": "db87da20d87bed33da03a47847b2b4fe24dad2723772ea3a0f027eb2e4dee0c0", "distro": "debian-10", "type": "NAMI", - "version": "7.4.25-1" + "version": "7.4.25-2" }, "render-template": { "arch": "amd64", diff --git a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index ae5e2459c377..b438c913341d 100644 --- a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -50,8 +50,9 @@ ensure_dir_exists() { # boolean ######################### is_dir_empty() { - local dir="${1:?missing directory}" - + local -r path="${1:?missing directory}" + # Calculate real path in order to avoid issues with symlinks + local -r dir="$(realpath "$path")" if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then true else @@ -88,7 +89,7 @@ is_file_writable() { local dir dir="$(dirname "$file")" - if [[ ( -f "$file" && -w "$file" ) || ( ! -f "$file" && -d "$dir" && -w "$dir" ) ]]; then + if [[ (-f "$file" && -w "$file") || (! -f "$file" && -d "$dir" && -w "$dir") ]]; then true else false @@ -136,31 +137,31 @@ configure_permissions_ownership() { shift 1 while [ "$#" -gt 0 ]; do case "$1" in - -f|--file-mode) - shift - file_mode="${1:?missing mode for files}" - ;; - -d|--dir-mode) - shift - dir_mode="${1:?missing mode for directories}" - ;; - -u|--user) - shift - user="${1:?missing user}" - ;; - -g|--group) - shift - group="${1:?missing group}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; + -f | --file-mode) + shift + file_mode="${1:?missing mode for files}" + ;; + -d | --dir-mode) + shift + dir_mode="${1:?missing mode for directories}" + ;; + -u | --user) + shift + user="${1:?missing user}" + ;; + -g | --group) + shift + group="${1:?missing group}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; esac shift done - read -r -a filepaths <<< "$paths" + read -r -a filepaths <<<"$paths" for p in "${filepaths[@]}"; do if [[ -e "$p" ]]; then if [[ -n $dir_mode ]]; then diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md index 735528051579..657205188e86 100644 --- a/bitnami/drupal-nginx/README.md +++ b/bitnami/drupal-nginx/README.md @@ -42,7 +42,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`9`, `9-debian-10`, `9.2.7`, `9.2.7-debian-10-r24`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.2.7-debian-10-r24/9/debian-10/Dockerfile) +* [`9`, `9-debian-10`, `9.2.7`, `9.2.7-debian-10-r25`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.2.7-debian-10-r25/9/debian-10/Dockerfile) * [`8`, `8-debian-10`, `8.9.19`, `8.9.19-debian-10-r43` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.19-debian-10-r43/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).