diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index e792f1b1e1ec..e9c927e65fb4 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -21,14 +21,14 @@ RUN apt-get update && apt-get upgrade -y && \ 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-r10" \ + BITNAMI_IMAGE_VERSION="5.1.3-debian-10-r11" \ 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/scripts/libfs.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 1b504b1df458..21b964ff1cf4 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,8 +74,9 @@ is_dir_empty() { # boolean ######################### is_mounted_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 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 3f71220ef485..3483ade7195c 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-r10`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.3-debian-10-r10/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.3`, `5.1.3-debian-10-r11`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.3-debian-10-r11/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).