From 1c5692a91c5287d298b2efc03ddad66e499c583a Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Sun, 21 Feb 2021 12:36:59 -0500
Subject: [PATCH] Improved Dokuwiki

---
 public/v4/apps/dokuwiki.yml | 56 ++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/public/v4/apps/dokuwiki.yml b/public/v4/apps/dokuwiki.yml
index 91acfca..c35622a 100644
--- a/public/v4/apps/dokuwiki.yml
+++ b/public/v4/apps/dokuwiki.yml
@@ -1,43 +1,55 @@
 captainVersion: 4
 services:
     $$cap_appname:
-        image: linuxserver/dokuwiki:$$cap_dokuwiki_version
+        image: bitnami/dokuwiki:$$cap_dokuwiki_version
         environment:
-            TZ: $$cap_tz
-            PUID: $$cap_puid
-            PGID: $$cap_guid
+            DOKUWIKI_USERNAME: $$DOKUWIKI_USERNAME
+            DOKUWIKI_EMAIL: $$DOKUWIKI_EMAIL
+            DOKUWIKI_FULL_NAME: $$DOKUWIKI_FULL_NAME
+            DOKUWIKI_PASSWORD: $$DOKUWIKI_PASSWORD
+            DOKUWIKI_WIKI_NAME: $$DOKUWIKI_WIKI_NAME
+        caproverExtra:
+            containerHttpPort: '8080'
         volumes:
-            - $$cap_appname-config:/config
+            - $$cap_appname:/bitnami/dokuwiki
 caproverOneClickApp:
     variables:
         - id: $$cap_dokuwiki_version
           label: DokuWiki Version
-          defaultValue: version-2020-07-29
-          description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/dokuwiki/tags
+          defaultValue: 20200729-debian-10
+          description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitnami/dokuwiki/tags
           validRegex: /^([^\s^\/])+$/
-        - id: $$cap_puid
-          label: User ID
-          defaultValue: '1000'
-          description: User ID that the process uses
+        - id: $$DOKUWIKI_USERNAME
+          label: username
+          defaultValue: 'user'
+          description: Dokuwiki application username
           validRegex: /.{1,}/
-        - id: $$cap_guid
-          label: Group ID
-          defaultValue: '1000'
-          description: Group ID that the process uses
+        - id: $$DOKUWIKI_EMAIL
+          label: email
+          defaultValue: 'noreply@gmail.com'
+          description: Dokuwiki application user email
           validRegex: /.{1,}/
-        - id: $$cap_tz
-          label: Time Zone
-          defaultValue: America/New_York
-          description: Get yours from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+        - id: $$DOKUWIKI_FULL_NAME
+          label: full name
+          defaultValue: 'full name'
+          description: Dokuwiki application user full name
+          validRegex: /.{1,}/
+        - id: $$DOKUWIKI_PASSWORD
+          label: password
+          defaultValue: 'password'
+          description: Dokuwiki application password
+          validRegex: /.{1,}/
+        - id: $$DOKUWIKI_WIKI_NAME
+          label: Dokuwiki
+          defaultValue: 'Dokuwiki wiki name'
+          description: Dokuwiki wiki name
           validRegex: /.{1,}/
     instructions:
         start: Dokuwiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.
         end: >-
             Dokuwiki has been successfully deployed. Please wait about 2 minutes before accessing Dokuwiki.
 
-
-            Navigate to /install.php to finish the installation! More details: https://github.com/linuxserver/docker-dokuwiki#application-setup
     displayName: DokuWiki
     isOfficial: true
     description: Dokuwiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database.
-    documentation: Taken from https://hub.docker.com/r/linuxserver/dokuwiki/tags
+    documentation: Taken from https://hub.docker.com/r/bitnami/dokuwiki/tags