diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile index 38ad17001fbd..d8601091591a 100644 --- a/bitnami/drupal/9/debian-10/Dockerfile +++ b/bitnami/drupal/9/debian-10/Dockerfile @@ -9,13 +9,13 @@ 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 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.23-0" --checksum 4c54a0ac188f9ad425845ad36c0aaefd2d1367808fba23ba901d93675345c141 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-2" --checksum ce45103c76533b1fc3b07466dfb0c00aa9fa54b736dbd5e22160ef775233c880 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.23-2" --checksum 821704fc85d765c55c5ed89127aa3be4593bd9e8119bf82af52f42ef90312910 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-3" --checksum c54bb354c5818d1170479f69c022b3b5a068a9f4267686d1f94597bc85ba16ab RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.31-2" --checksum 15b394a022ca1d0b4b89bfee0487ee13f9e8cc697d0ca09ce62a0a3732536236 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.23-0" --checksum b94aeadeeef94f7a3ca45f1a2e6c2afe33e24789e9f9c26c803ba307744ac5a0 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.2.5-0" --checksum 7c398b67d0479b98cbc9d4c06ee8b44c806d43022a3f6a0eb9da56599780a255 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.2.6-0" --checksum b22dcf048191dc22fd8b4b8ebe8fa4b012c727101f688478a1066ba0899e2e43 RUN chmod g+rwX /opt/bitnami COPY rootfs / @@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="drupal" \ - BITNAMI_IMAGE_VERSION="9.2.5-debian-10-r12" \ + BITNAMI_IMAGE_VERSION="9.2.6-debian-10-r0" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 4ba28bab5d7a..65c5f7fe7dbf 100644 --- a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,17 +1,17 @@ { "apache": { "arch": "amd64", - "digest": "ce45103c76533b1fc3b07466dfb0c00aa9fa54b736dbd5e22160ef775233c880", + "digest": "c54bb354c5818d1170479f69c022b3b5a068a9f4267686d1f94597bc85ba16ab", "distro": "debian-10", "type": "NAMI", - "version": "2.4.48-2" + "version": "2.4.48-3" }, "drupal": { "arch": "amd64", - "digest": "7c398b67d0479b98cbc9d4c06ee8b44c806d43022a3f6a0eb9da56599780a255", + "digest": "b22dcf048191dc22fd8b4b8ebe8fa4b012c727101f688478a1066ba0899e2e43", "distro": "debian-10", "type": "NAMI", - "version": "9.2.5-0" + "version": "9.2.6-0" }, "gosu": { "arch": "amd64", @@ -36,10 +36,10 @@ }, "php": { "arch": "amd64", - "digest": "4c54a0ac188f9ad425845ad36c0aaefd2d1367808fba23ba901d93675345c141", + "digest": "821704fc85d765c55c5ed89127aa3be4593bd9e8119bf82af52f42ef90312910", "distro": "debian-10", "type": "NAMI", - "version": "7.4.23-0" + "version": "7.4.23-2" }, "render-template": { "arch": "amd64", diff --git a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index a8323db72d93..4265aae0a673 100644 --- a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -141,10 +141,51 @@ am_i_root() { if [[ "$(id -u)" = "0" ]]; then true else - false + false fi } +######################## +# Print OS metadata +# Arguments: +# $1 - Flag name +# Flags: +# --id - Distro ID +# --version - Distro version +# --branch - Distro branch +# --codename - Distro codename +# Returns: +# String +######################### +get_os_metadata() { + local -r flag_name="${1:?missing flag}" + # Helper function + get_os_release_metadata() { + local -r env_name="${1:?missing environment variable name}" + ( + . /etc/os-release + echo "${!env_name}" + ) + } + case "$flag_name" in + --id) + get_os_release_metadata ID + ;; + --version) + get_os_release_metadata VERSION_ID + ;; + --branch) + get_os_release_metadata VERSION_ID | sed 's/\..*//' + ;; + --codename) + get_os_release_metadata VERSION_CODENAME + ;; + *) + error "Unknown flag ${flag_name}" + return 1 + esac +} + ######################## # Get total memory available # Arguments: diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index d1ef45dae530..68bcde274d7f 100644 --- a/bitnami/drupal/README.md +++ b/bitnami/drupal/README.md @@ -41,7 +41,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.6`, `9.2.6-debian-10-r-1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.2.6-debian-10-r-1/9/debian-10/Dockerfile) +* [`9`, `9-debian-10`, `9.2.6`, `9.2.6-debian-10-r0`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.2.6-debian-10-r0/9/debian-10/Dockerfile) * [`8`, `8-debian-10`, `8.9.19`, `8.9.19-debian-10-r0` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.19-debian-10-r0/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).