From 29898a577a89360c49154d8f99e759b61622dafd Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 3 Nov 2021 11:41:30 +0000 Subject: [PATCH] 5.1.1-debian-10-r135 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 8 +-- .../opt/bitnami/.bitnami_components.json | 8 +-- .../prebuildfs/opt/bitnami/scripts/libfs.sh | 49 ++++++++++--------- bitnami/phpmyadmin/README.md | 2 +- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index d332fca26da8..3c088870d11b 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -9,18 +9,18 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl 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 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 zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.12-1" --checksum 1249b8a23286f5795b332afdb871249dfb33d60a916b001c7cbcfe9791c84e65 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.12-3" --checksum 3465af927ef705d89d7a10156ed8bbfa659def7ca3270a3c3dff284762af9af5 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.51-0" --checksum 71010c86332e4ad0993bc875d103bb916184f1f42884a9098db65c969553c34a 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" "8.0.12-0" --checksum b32bf5ba3853af0beb935ff60870f08d06998bcabbd9eed2c71923dd1837621d -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-1" --checksum 00722b62c7561929e039877a6e445a4bb782c340890c0a090fdae3c9e1960161 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.1.1-0" --checksum b2dbf36aeb64d28e1ae862d63185419c92ec957d8534cdbc5bb2076a78858856 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e RUN chmod g+rwX /opt/bitnami COPY rootfs / -RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/apache/postunpack.sh +RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ @@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.1.1-debian-10-r134" \ + BITNAMI_IMAGE_VERSION="5.1.1-debian-10-r135" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 507ebf34c807..8d4a7979228c 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "1249b8a23286f5795b332afdb871249dfb33d60a916b001c7cbcfe9791c84e65", + "digest": "3465af927ef705d89d7a10156ed8bbfa659def7ca3270a3c3dff284762af9af5", "distro": "debian-10", "type": "NAMI", - "version": "8.0.12-1" + "version": "8.0.12-3" }, "phpmyadmin": { "arch": "amd64", @@ -43,9 +43,9 @@ }, "render-template": { "arch": "amd64", - "digest": "8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe", + "digest": "00722b62c7561929e039877a6e445a4bb782c340890c0a090fdae3c9e1960161", "distro": "debian-10", "type": "NAMI", - "version": "1.0.0-3" + "version": "1.0.1-1" } } \ No newline at end of file diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index ae5e2459c377..b438c913341d 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/phpmyadmin/5/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/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index dbcafd5002fa..18b1f946860b 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -38,7 +38,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/). -* [`5`, `5-debian-10`, `5.1.1`, `5.1.1-debian-10-r134`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.1-debian-10-r134/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.1`, `5.1.1-debian-10-r135`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.1-debian-10-r135/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).