Merge pull request #54 from linuxserver/3.17

thespad · web-flow · commit a5b602e04d13 · 2022-12-30T15:54:03.000Z
Rebase to 3.17, migrate to s6v3
diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml
@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit
diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_DOKUWIKI_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(docker run --rm alpine:3.9 sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null | xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | cut -d'-' -f2-4 | cut -d'.' -f1')
+          EXT_RELEASE=$(docker run --rm alpine:latest sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null | xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | cut -d'-' -f2-4 | cut -d'.' -f1')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for dokuwiki branch master"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,31 +12,29 @@ LABEL maintainer="chbmb"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    tar \
     xmlstarlet && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    curl \
     imagemagick \
-    php8-bz2 \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-gd \
-    php8-iconv \
-    php8-ldap \
-    php8-pdo_mysql \
-    php8-pdo_pgsql \
-    php8-pdo_sqlite \
-    php8-pecl-imagick \
-    php8-sqlite3 \
-    php8-xml \
-    php8-zip && \
+    php81-bz2 \
+    php81-ctype \
+    php81-curl \
+    php81-dom \
+    php81-gd \
+    php81-iconv \
+    php81-ldap \
+    php81-pdo_mysql \
+    php81-pdo_pgsql \
+    php81-pdo_sqlite \
+    php81-pecl-imagick \
+    php81-sqlite3 \
+    php81-xml \
+    php81-zip && \
   echo "**** install dokuwiki ****" && \
   if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
     DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
-        xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
-        cut -d'-' -f2-4 | cut -d'.' -f1 ); \
+      xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
+      cut -d'-' -f2-4 | cut -d'.' -f1 ); \
   fi && \
   curl -o \
   /tmp/dokuwiki.tar.gz -L \
@@ -48,7 +48,7 @@ RUN \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root/.cache \
+    $HOME/.cache \
     /tmp/*
 
 # copy local files
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,31 +12,29 @@ LABEL maintainer="chbmb"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    tar \
     xmlstarlet && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    curl \
     imagemagick \
-    php8-bz2 \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-gd \
-    php8-iconv \
-    php8-ldap \
-    php8-pdo_mysql \
-    php8-pdo_pgsql \
-    php8-pdo_sqlite \
-    php8-pecl-imagick \
-    php8-sqlite3 \
-    php8-xml \
-    php8-zip && \
+    php81-bz2 \
+    php81-ctype \
+    php81-curl \
+    php81-dom \
+    php81-gd \
+    php81-iconv \
+    php81-ldap \
+    php81-pdo_mysql \
+    php81-pdo_pgsql \
+    php81-pdo_sqlite \
+    php81-pecl-imagick \
+    php81-sqlite3 \
+    php81-xml \
+    php81-zip && \
   echo "**** install dokuwiki ****" && \
   if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
     DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
-        xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
-        cut -d'-' -f2-4 | cut -d'.' -f1 ); \
+      xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
+      cut -d'-' -f2-4 | cut -d'.' -f1 ); \
   fi && \
   curl -o \
   /tmp/dokuwiki.tar.gz -L \
@@ -48,7 +48,7 @@ RUN \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root/.cache \
+    $HOME/.cache \
     /tmp/*
 
 # copy local files
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,31 +12,29 @@ LABEL maintainer="chbmb"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    tar \
     xmlstarlet && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    curl \
     imagemagick \
-    php8-bz2 \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-gd \
-    php8-iconv \
-    php8-ldap \
-    php8-pdo_mysql \
-    php8-pdo_pgsql \
-    php8-pdo_sqlite \
-    php8-pecl-imagick \
-    php8-sqlite3 \
-    php8-xml \
-    php8-zip && \
+    php81-bz2 \
+    php81-ctype \
+    php81-curl \
+    php81-dom \
+    php81-gd \
+    php81-iconv \
+    php81-ldap \
+    php81-pdo_mysql \
+    php81-pdo_pgsql \
+    php81-pdo_sqlite \
+    php81-pecl-imagick \
+    php81-sqlite3 \
+    php81-xml \
+    php81-zip && \
   echo "**** install dokuwiki ****" && \
   if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
     DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
-        xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
-        cut -d'-' -f2-4 | cut -d'.' -f1 ); \
+      xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
+      cut -d'-' -f2-4 | cut -d'.' -f1 ); \
   fi && \
   curl -o \
   /tmp/dokuwiki.tar.gz -L \
@@ -48,7 +48,7 @@ RUN \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root/.cache \
+    $HOME/.cache \
     /tmp/*
 
 # copy local files
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' docker run --rm alpine:3.9 sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null | xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | cut -d'-' -f2-4 | cut -d'.' -f1' ''',
+            script: ''' docker run --rm alpine:latest sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null | xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | cut -d'-' -f2-4 | cut -d'.' -f1' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/README.md b/README.md
@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.12.22:** - Rebase to Alpine 3.17, migrate to s6v3.
 * **11.13.22:** - Move lib/images/smileys/local and lib/images/interwiki outside of the container for user defined smiley and interwiki icon support.
 * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **20.07.21:** - Add php7-dom, fixes minor issues in sprintdoc template.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-dokuwiki
 external_type: na
-custom_version_command: "docker run --rm alpine:3.9 sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null | xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | cut -d'-' -f2-4 | cut -d'.' -f1'"
+custom_version_command: "docker run --rm alpine:latest sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null | xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | cut -d'-' -f2-4 | cut -d'.' -f1'"
 release_type: stable
 release_tag: latest
 ls_branch: master
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -40,6 +40,7 @@ app_setup_block: |
   Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [{{ project_name|capitalize }}]({{ project_url }})
 # changelog
 changelogs:
+  - { date: "28.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3." }
   - { date: "11.13.22:", desc: "Move lib/images/smileys/local and lib/images/interwiki outside of the container for user defined smiley and interwiki icon support." }
   - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "20.07.21:", desc: "Add php7-dom, fixes minor issues in sprintdoc template." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-dokuwiki-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-dokuwiki-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/dependencies.d/init-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/run b/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 USER_DIRECTORY=(\
     "conf" \
@@ -48,6 +49,7 @@ for i in "${USER_DIRECTORY[@]}"; do
     if [[ ! -L /app/www/public/"${i}" ]]; then
         ln -s /config/dokuwiki/"${i}" /app/www/public/"${i}"
     fi
+    lsiown abc:abc /config/dokuwiki/"${i}"
 done
 
 ## Make Symlinks from /app/www/public to /config/dokuwiki
@@ -60,13 +62,9 @@ for i in "${CORE_DIR[@]}"; do
     if [[ ! -L /config/dokuwiki/"${i}" ]]; then
         ln -s /app/www/public/"${i}" /config/dokuwiki/"${i}"
     fi
+    lsiown abc:abc /config/dokuwiki/"${i}"
 done
 
-## TODO: Remove this following bit by 12/19/2020
-# Remove erronously added configs post-init
-sed -i "s/^upload_max_filesize = 100MB$//g" /config/php/php-local.ini
-sed -i "s/^post_max_size = 100MB$//g" /config/php/php-local.ini
-
 ## Bump php upload max filesize and post max size to 100MB by default
 if ! grep -qF 'upload_max_filesize' /config/php/php-local.ini; then
     echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini
@@ -97,7 +95,6 @@ fi
 sed -i 's%location ~ /(conf/|bin/|inc/|install.php) { deny all; }%location ~ /(conf/|bin/|inc/|vendor/) { deny all; }%' /config/nginx/site-confs/default.conf
 
 # permissions
-echo "[cont-init.d] Setting permissions this may take some time"
-chown -R abc:abc \
-    /app/www/public \
-    /config
+lsiown -R abc:abc \
+    /app/www/public/data \
+    /config/dokuwiki/lib
diff --git a/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/type b/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/up b/root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-dokuwiki-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-dokuwiki-config

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ pipeline {`
`104`	`104`	`steps{`
`105`	`105`	`script{`
`106`	`106`	`env.EXT_RELEASE = sh(`
`107`		`- script: ''' docker run --rm alpine:3.9 sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null \| xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' \| cut -d'-' -f2-4 \| cut -d'.' -f1' ''',`
	`107`	`+ script: ''' docker run --rm alpine:latest sh -c 'apk add xmlstarlet > /dev/null 2>&1 && wget https://download.dokuwiki.org/rss -O - 2>/dev/null \| xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' \| cut -d'-' -f2-4 \| cut -d'.' -f1' ''',`
`108`	`108`	`returnStdout: true).trim()`
`109`	`109`	`env.RELEASE_LINK = 'custom_command'`
`110`	`110`	`}`