From 8b158c34b3f8e20bcacb6d7a05d49934edf34f58 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 2 Mar 2022 04:52:38 +0000 Subject: [PATCH] 5.1.3-debian-10-r16 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 18 ++++++------ .../opt/bitnami/.bitnami_components.json | 28 +++++++++---------- .../prebuildfs/opt/bitnami/scripts/libfs.sh | 5 ++-- bitnami/phpmyadmin/README.md | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 8cd7e3f395f5..dd645b596dca 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -9,26 +9,26 @@ 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.16-3" --checksum 817770ae9dfde8519b8ffcc74621262ab09218d7fd3b4532b7dc5977956fa86e -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.52-7" --checksum a95264737aaeada58b5e3e42b865a9c953b71802472538c0a4529cdb9f3f7e2c -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.34-3" --checksum ac406fd038f4e46388452ae0a9b631044d0846934be7d80a4aec21a251fe2596 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.16-1" --checksum b040c3375f01efdb6fc783920f8c7b017affa369a0ec81eb25fd9dbcc5ec8a94 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-9" --checksum 4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.1.3-2" --checksum 06eceea4e067b52c7914ca29a47a6450590741dfe86852cff7f4a6c88bf560a6 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.16-4" --checksum 04b5eb0c777e9baa8f9a7eaa7783e280d730863bfe011d1ef66665ae44b85cc2 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.52-8" --checksum 93e282918042188b83e20d054c3b97c7cd2d0417e459d36c8e328aa8836f645b +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.34-4" --checksum bb0089c26028b568dbe8b8875d39cca3c7835c582dda4fcbdcbed599320c57fe +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.16-2" --checksum 0a9a8b80cdc444a1c5d94f7d9c85a7e88e3bb8f2f5229e214f9fb1c08088d609 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.1.3-3" --checksum 474969e2f578ab26510f1261cb2235ee8a71ac0df616f66a4435a73a19fc81fd +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives 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 APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.1.3-debian-10-r15" \ + BITNAMI_IMAGE_VERSION="5.1.3-debian-10-r16" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8080 8443 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 8388ac1e69ad..5711998c69ef 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 @@ -1,51 +1,51 @@ { "apache": { "arch": "amd64", - "digest": "a95264737aaeada58b5e3e42b865a9c953b71802472538c0a4529cdb9f3f7e2c", + "digest": "93e282918042188b83e20d054c3b97c7cd2d0417e459d36c8e328aa8836f645b", "distro": "debian-10", "type": "NAMI", - "version": "2.4.52-7" + "version": "2.4.52-8" }, "gosu": { "arch": "amd64", - "digest": "6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664", + "digest": "d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1", "distro": "debian-10", "type": "NAMI", - "version": "1.14.0-6" + "version": "1.14.0-7" }, "libphp": { "arch": "amd64", - "digest": "b040c3375f01efdb6fc783920f8c7b017affa369a0ec81eb25fd9dbcc5ec8a94", + "digest": "0a9a8b80cdc444a1c5d94f7d9c85a7e88e3bb8f2f5229e214f9fb1c08088d609", "distro": "debian-10", "type": "NAMI", - "version": "8.0.16-1" + "version": "8.0.16-2" }, "mysql-client": { "arch": "amd64", - "digest": "ac406fd038f4e46388452ae0a9b631044d0846934be7d80a4aec21a251fe2596", + "digest": "bb0089c26028b568dbe8b8875d39cca3c7835c582dda4fcbdcbed599320c57fe", "distro": "debian-10", "type": "NAMI", - "version": "10.3.34-3" + "version": "10.3.34-4" }, "php": { "arch": "amd64", - "digest": "817770ae9dfde8519b8ffcc74621262ab09218d7fd3b4532b7dc5977956fa86e", + "digest": "04b5eb0c777e9baa8f9a7eaa7783e280d730863bfe011d1ef66665ae44b85cc2", "distro": "debian-10", "type": "NAMI", - "version": "8.0.16-3" + "version": "8.0.16-4" }, "phpmyadmin": { "arch": "amd64", - "digest": "06eceea4e067b52c7914ca29a47a6450590741dfe86852cff7f4a6c88bf560a6", + "digest": "474969e2f578ab26510f1261cb2235ee8a71ac0df616f66a4435a73a19fc81fd", "distro": "debian-10", "type": "NAMI", - "version": "5.1.3-2" + "version": "5.1.3-3" }, "render-template": { "arch": "amd64", - "digest": "4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb", + "digest": "97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565", "distro": "debian-10", "type": "NAMI", - "version": "1.0.1-9" + "version": "1.0.1-10" } } \ 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 21b964ff1cf4..1b504b1df458 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 @@ -74,9 +74,8 @@ is_dir_empty() { # boolean ######################### is_mounted_dir_empty() { - local -r path="${1:?missing directory}" - # Calculate real path in order to avoid issues with symlinks - local -r dir="$(realpath "$path")" + local dir="${1:?missing directory}" + if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then true else diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 1a0be0496e3c..be79e234af31 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/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/). -* [`5`, `5-debian-10`, `5.1.3`, `5.1.3-debian-10-r15`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.3-debian-10-r15/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.3`, `5.1.3-debian-10-r16`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.3-debian-10-r16/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).