From a065c33d45e9f6c251926d0f7e79b623e3765b0f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 2 Mar 2022 04:29:53 +0000 Subject: [PATCH] 20200729.0.0-debian-10-r518 release --- .../dokuwiki/20200729/debian-10/Dockerfile | 16 ++++++------- .../opt/bitnami/.bitnami_components.json | 24 +++++++++---------- .../prebuildfs/opt/bitnami/scripts/libfs.sh | 5 ++-- bitnami/dokuwiki/README.md | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/bitnami/dokuwiki/20200729/debian-10/Dockerfile b/bitnami/dokuwiki/20200729/debian-10/Dockerfile index baaa0c15214e..ba6653c6b1b5 100644 --- a/bitnami/dokuwiki/20200729/debian-10/Dockerfile +++ b/bitnami/dokuwiki/20200729/debian-10/Dockerfile @@ -9,25 +9,25 @@ 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 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 zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.28-4" --checksum f88eaca2c2d0a6626717675499d9ef42a6a5796508048c30da91164f970581d3 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.52-7" --checksum a95264737aaeada58b5e3e42b865a9c953b71802472538c0a4529cdb9f3f7e2c -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.28-2" --checksum 169b17649e6687a7d38c49f594d122044d5a1b8c897995bfc07c57a5bc4458ff -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-9" --checksum 4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "dokuwiki" "20200729.0.0-9" --checksum ed1ec522a848f078b7952384157f2542a061c8913bc4620510b25e4a818516b2 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.28-5" --checksum 7585bd826b93c427de4b44be87f1e89f8e6a76cd8ddd9ff21416fed5588136ee +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.52-8" --checksum 93e282918042188b83e20d054c3b97c7cd2d0417e459d36c8e328aa8836f645b +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.28-3" --checksum 5d76ba9ab947c2a96717eaa78803cfaa8acf35128f30035a26a1f22c2da92f37 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "dokuwiki" "20200729.0.0-10" --checksum 66e7ab7ed41c99715d7358d0c9770241f91d5ef1310cd22ddda1d01d63e60070 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/dokuwiki/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="dokuwiki" \ - BITNAMI_IMAGE_VERSION="20200729.0.0-debian-10-r517" \ + BITNAMI_IMAGE_VERSION="20200729.0.0-debian-10-r518" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 69eaaba890c6..207ba37456ba 100644 --- a/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,44 +1,44 @@ { "apache": { "arch": "amd64", - "digest": "a95264737aaeada58b5e3e42b865a9c953b71802472538c0a4529cdb9f3f7e2c", + "digest": "93e282918042188b83e20d054c3b97c7cd2d0417e459d36c8e328aa8836f645b", "distro": "debian-10", "type": "NAMI", - "version": "2.4.52-7" + "version": "2.4.52-8" }, "dokuwiki": { "arch": "amd64", - "digest": "ed1ec522a848f078b7952384157f2542a061c8913bc4620510b25e4a818516b2", + "digest": "66e7ab7ed41c99715d7358d0c9770241f91d5ef1310cd22ddda1d01d63e60070", "distro": "debian-10", "type": "NAMI", - "version": "20200729.0.0-9" + "version": "20200729.0.0-10" }, "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": "169b17649e6687a7d38c49f594d122044d5a1b8c897995bfc07c57a5bc4458ff", + "digest": "5d76ba9ab947c2a96717eaa78803cfaa8acf35128f30035a26a1f22c2da92f37", "distro": "debian-10", "type": "NAMI", - "version": "7.4.28-2" + "version": "7.4.28-3" }, "php": { "arch": "amd64", - "digest": "f88eaca2c2d0a6626717675499d9ef42a6a5796508048c30da91164f970581d3", + "digest": "7585bd826b93c427de4b44be87f1e89f8e6a76cd8ddd9ff21416fed5588136ee", "distro": "debian-10", "type": "NAMI", - "version": "7.4.28-4" + "version": "7.4.28-5" }, "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/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/dokuwiki/20200729/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/dokuwiki/README.md b/bitnami/dokuwiki/README.md index 3b45d9dae56d..ffe87fc64918 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -37,7 +37,7 @@ Non-root container images add an extra layer of security and are generally recom 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/). -* [`20200729`, `20200729-debian-10`, `20200729.0.0`, `20200729.0.0-debian-10-r517`, `latest` (20200729/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-10-r517/20200729/debian-10/Dockerfile) +* [`20200729`, `20200729-debian-10`, `20200729.0.0`, `20200729.0.0-debian-10-r518`, `latest` (20200729/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-10-r518/20200729/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/dokuwiki GitHub repo](https://github.com/bitnami/bitnami-docker-dokuwiki).