update dokuwiki

README.md

@@ -193,7 +193,6 @@ A collection of delicious docker recipes.
 - [x] ~discuz~ :cn: :skull:
 - [x] django-cms
 - [x] dokuwiki :+1:
-- [x] dokuwiki-arm :+1:
 - [x] gogs-arm :cn:
 - [x] hugo
 - [x] hugo-arm

dokuwiki/Dockerfile

@@ -13,13 +13,14 @@ RUN set -xe \
         gzip \
         nginx \
         openssl \
-        php7-fpm \
+        php8-fpm \
-        php7-json \
+        php8-json \
-        php7-openssl \
+        php8-openssl \
-        php7-pdo_sqlite \
+        php8-pdo_sqlite \
-        php7-sqlite3 \
+        php8-session \
-        php7-xml \
+        php8-sqlite3 \
-        php7-zlib \
+        php8-xml \
+        php8-zlib \
         tar \
     && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
     && chown -R nobody:nobody .
@@ -37,4 +38,4 @@ VOLUME /var/www/html/conf \
 
 EXPOSE 80
 
-CMD php-fpm7 && nginx -g 'daemon off;'
+CMD php-fpm8 && nginx -g 'daemon off;'

dokuwiki/Dockerfile.debian

@@ -6,13 +6,13 @@
 # - https://www.dokuwiki.org/faq:backup
 #
 
-FROM php:5.6-apache
+FROM php:8-apache
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 WORKDIR /var/www/html
 
 RUN a2enmod rewrite
-RUN curl "http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" | tar xz --strip 1
+RUN curl -sSL "http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" | tar xz --strip 1
 RUN chown -R www-data:www-data .
 
 VOLUME /var/www/html/data/pages \

dokuwiki/arm/Dockerfile

@@ -1,40 +0,0 @@
-#
-# Dockerfile for dokuwiki-arm
-#
-
-FROM easypi/alpine-arm
-MAINTAINER EasyPi Software Foundation
-
-WORKDIR /var/www/html
-
-RUN set -xe \
-    && apk add --no-cache \
-        ca-certificates \
-        gzip \
-        nginx \
-        openssl \
-        php7-fpm \
-        php7-json \
-        php7-openssl \
-        php7-pdo_sqlite \
-        php7-sqlite3 \
-        php7-xml \
-        php7-zlib \
-        tar \
-    && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
-    && chown -R nobody:nobody .
-
-COPY nginx.conf /etc/nginx/nginx.conf
-
-VOLUME /var/www/html/conf \
-       /var/www/html/data/pages \
-       /var/www/html/data/meta \
-       /var/www/html/data/media \
-       /var/www/html/data/media_attic \
-       /var/www/html/data/media_meta \
-       /var/www/html/data/attic \
-       /var/www/html/lib/plugins
-
-EXPOSE 80
-
-CMD php-fpm5 && nginx -g 'daemon off;'

dokuwiki/arm/docker-compose.yml

@@ -1,5 +0,0 @@
-dokuwiki:
-  image: easypi/dokuwiki-arm
-  ports:
-      - "8000:80"
-  restart: always

dokuwiki/arm/nginx.conf

@@ -1,53 +0,0 @@
-user                            nginx;
-worker_processes                4;
-pid                             /run/nginx.pid;
-
-events {
-    worker_connections          1024;
-}
-
-http {
-    include                     mime.types;
-    default_type                application/octet-stream;
-    sendfile                    on;
-    keepalive_timeout           65;
-
-    server {
-        listen                  80;
-        server_name             _;
-        client_max_body_size    4M;
-        client_body_buffer_size 128k;
-        root                    /var/www/html;
-        index                   doku.php;
-
-        location ~ /(data/|conf/|bin/|inc/) {
-            deny                all;
-        }
-
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
-            expires             31536000s;
-            add_header          Pragma "public";
-            add_header          Cache-Control "max-age=31536000, public, must-revalidate, proxy-revalidate";
-            log_not_found       off;
-        }
-
-        location / {
-            try_files           $uri $uri/ @dokuwiki;
-        }
-
-        location @dokuwiki {
-            rewrite             ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
-            rewrite             ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
-            rewrite             ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
-            rewrite             ^/(.*) /doku.php?id=$1&$args last;
-        }
-     
-        location ~ \.php$ {
-            try_files           $uri $uri/ /doku.php;
-            include             fastcgi_params;
-            fastcgi_param       SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param       REDIRECT_STATUS 200;
-            fastcgi_pass        127.0.0.1:9000;
-        }
-    }
-}

dokuwiki/docker-compose.yml

@@ -1,5 +1,7 @@
-dokuwiki:
+version: "3.8"
-  image: vimagick/dokuwiki
+services:
-  ports:
+  dokuwiki:
-    - "8000:80"
+    image: vimagick/dokuwiki
-  restart: always
+    ports:
+      - "8000:80"
+    restart: unless-stopped

dokuwiki/nginx.conf

@@ -1,12 +1,14 @@
 user                            nginx;
 worker_processes                4;
 pid                             /run/nginx.pid;
+error_log                       /dev/stderr info;
 
 events {
     worker_connections          1024;
 }
 
 http {
+    access_log                  /dev/stdout;
     include                     mime.types;
     default_type                application/octet-stream;
     sendfile                    on;