Merge pull request #23 from linuxserver/s6v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16
 
 ARG BUILD_DATE
 ARG VERSION
@@ -17,8 +17,6 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     php8-bz2 \
     php8-curl \
     php8-dom \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16
 ARG BUILD_DATE
 ARG VERSION
 ARG PHPMYADMIN_VERSION
@@ -16,8 +16,6 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     php8-bz2 \
     php8-curl \
     php8-dom \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16
 ARG BUILD_DATE
 ARG VERSION
 ARG PHPMYADMIN_VERSION
@@ -16,8 +16,6 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     php8-bz2 \
     php8-curl \
     php8-dom \

README.md

@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.11.22:** - Rebasing to Alpine 3.16, migrate to s6v3.
 * **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)).
 * **23.01.22:** - Pin versions to 5.x.x.
 * **14.06.21:** - Initial Release.

readme-vars.yml

@@ -47,6 +47,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.11.22:", desc: "Rebasing to Alpine 3.16, migrate to s6v3." }
   - { 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: "23.01.22:", desc: "Pin versions to 5.x.x." }
-  - { date: "14.06.21:", desc: "Initial Release." }
+  - { date: "14.06.21:", desc: "Initial Release." }

root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run

@@ -1,6 +1,8 @@
 #!/usr/bin/with-contenv bash
 
-mkdir -p /config/phpmyadmin
+mkdir -p \
+    /config/phpmyadmin \
+    /app/www/public/tmp
 
 if [ ! -f /config/phpmyadmin/config.secret.inc.php ]; then
     cat > /config/phpmyadmin/config.secret.inc.php <<EOT
@@ -17,7 +19,6 @@ if [ ! -f /config/phpmyadmin/config.inc.php ]; then
     cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php
 fi
 
-chown -R abc:abc \
-    /config
-
-find /app -print0 | xargs -P "$(nproc)" -I {} -0 chown abc:abc {}
+lsiown -R abc:abc \
+    /config \
+    /app/www/public/tmp

root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run

root/migrations/02-default-location

@@ -4,7 +4,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /app/phpmyadmin;"
 NEW_ROOT="root /app/www/public;"
 
-if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then
+if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null;then
     echo "updating root in ${DEFAULT_CONF}"
     sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
 fi