upgrade dokuwiki to "dokuwiki/dokuwiki"

bin/manageWiki.sh

@@ -117,7 +117,7 @@ Version(){
 Reload(){
     # $1 ContainerName
     if [ -f "${VOL_PREFIX}wikiData/_data/farms/init.sh" ]; then
-        ${SIMU} docker exec -ti "${1}" /dokuwiki/data/farms/init.sh
+        ${SIMU} docker exec -ti "${1}" /storage/data/farms/init.sh
         ${SIMU} pkill -KILL lighttpd
     fi
 }
@@ -169,4 +169,4 @@ for COMMAND in ${COMMANDS}; do
         'RELOAD' )
          Reload "${DockerServName}";;
     esac
-done
+done

config/orgaTmpl/docker-compose.yml

@@ -153,18 +153,19 @@ services:
 #}}
 #{{wiki
   dokuwiki:
-    image: mprasil/dokuwiki
+    image: dokuwiki/dokuwiki
     container_name: ${orga}-${dokuwikiServName}
     #disk_quota: 10G
     restart: ${restartPolicy}
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.${orga}-${dokuwikiServName}.rule=Host(`${orga}-${dokuwikiHost}.${domain}`){{FOREIGN_DW}}"
+      - "traefik.http.services.${orga}-${dokuwikiServName}.loadbalancer.server.port=8080"
     volumes:
-      - wikiData:/dokuwiki/data
-      - wikiConf:/dokuwiki/conf
-      - wikiPlugins:/dokuwiki/lib/plugins
-      - wikiLibtpl:/dokuwiki/lib/tpl
+      - wikiData:/storage/data
+      - wikiConf:/storage/conf
+      - wikiPlugins:/storage/lib/plugins
+      - wikiLibtpl:/storage/lib/tpl
       - wikiLogs:/var/log
     networks:
       - orgaNet

config/orgaTmpl/reload.sh

@@ -12,4 +12,4 @@ ORGA_DIR=$(basename ${PWD})
 ORGA=${ORGA_DIR%-orga}
 
 
-${KAZ_BIN_DIR}/manageWiki.sh --reload $ORGA
+${KAZ_BIN_DIR}/manageWiki.sh --reload $ORGA

dockers/dokuwiki/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
 
   dokuwiki:
-    image: mprasil/dokuwiki
+    image: dokuwiki/dokuwiki
     container_name: ${dokuwikiServName}
     restart: ${restartPolicy}
     # ports:
@@ -12,14 +12,15 @@ services:
     external_links:
       - ${smtpServName}:${smtpHost}.${domain}
     volumes:
-      - "dokuwikiData:/dokuwiki/data"
-      - "dokuwikiConf:/dokuwiki/conf"
-      - "dokuwikiPlugins:/dokuwiki/lib/plugins"
-      - "dokuwikiLibtpl:/dokuwiki/lib/tpl"
+      - "dokuwikiData:/storage/data"
+      - "dokuwikiConf:/storage/conf"
+      - "dokuwikiPlugins:/storage/lib/plugins"
+      - "dokuwikiLibtpl:/storage/lib/tpl"
       - "dokuwikiLogs:/var/log"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.${dokuwikiServName}.rule=Host(`${dokuwikiHost}.${domain}`)"
+      - "traefik.http.services.${dokuwikiServName}.loadbalancer.server.port=8080"
       - "traefik.docker.network=dokuwikiNet"
 
 volumes: