From 3b9bbc84b11eaad83d47fd272865271b6366b85d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 10 Dec 2021 18:08:56 +0000
Subject: [PATCH] 20200729.0.0-debian-10-r440 release

---
 bitnami/dokuwiki/20200729/debian-10/Dockerfile     |  4 ++--
 .../prebuildfs/opt/bitnami/scripts/libfs.sh        | 14 ++++++++++----
 bitnami/dokuwiki/README.md                         |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bitnami/dokuwiki/20200729/debian-10/Dockerfile b/bitnami/dokuwiki/20200729/debian-10/Dockerfile
index 5cb11f023b2b..2cd69ef2213b 100644
--- a/bitnami/dokuwiki/20200729/debian-10/Dockerfile
+++ b/bitnami/dokuwiki/20200729/debian-10/Dockerfile
@@ -18,15 +18,15 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "dokuwiki" "20200
 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_ENABLE_CUSTOM_PORTS="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="dokuwiki" \
-    BITNAMI_IMAGE_VERSION="20200729.0.0-debian-10-r439" \
+    BITNAMI_IMAGE_VERSION="20200729.0.0-debian-10-r440" \
     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/scripts/libfs.sh b/bitnami/dokuwiki/20200729/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index b438c913341d..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
@@ -20,8 +20,13 @@
 owned_by() {
     local path="${1:?path is missing}"
     local owner="${2:?owner is missing}"
+    local group="${3:-}"
 
-    chown "$owner":"$owner" "$path"
+    if [[ -n $group ]]; then
+        chown "$owner":"$group" "$path"
+    else
+        chown "$owner":"$owner" "$path"
+    fi
 }
 
 ########################
@@ -34,11 +39,12 @@ owned_by() {
 #########################
 ensure_dir_exists() {
     local dir="${1:?directory is missing}"
-    local owner="${2:-}"
+    local owner_user="${2:-}"
+    local owner_group="${3:-}"
 
     mkdir -p "${dir}"
-    if [[ -n $owner ]]; then
-        owned_by "$dir" "$owner"
+    if [[ -n $owner_user ]]; then
+        owned_by "$dir" "$owner_user" "$owner_group"
     fi
 }
 
diff --git a/bitnami/dokuwiki/README.md b/bitnami/dokuwiki/README.md
index 1a47fc7c6ffc..885d7516f651 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-r439`, `latest` (20200729/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-10-r439/20200729/debian-10/Dockerfile)
+* [`20200729`, `20200729-debian-10`, `20200729.0.0`, `20200729.0.0-debian-10-r440`, `latest` (20200729/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-10-r440/20200729/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/dokuwiki GitHub repo](https://github.com/bitnami/bitnami-docker-dokuwiki).