diff --git a/Dockerfile b/Dockerfile index 1962fbe..b6cbee0 100644 --- a/Dockerfile +++ b/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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2946516..d245621 100644 --- a/Dockerfile.aarch64 +++ b/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 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b02ede1..eb4d5d9 100644 --- a/Dockerfile.armhf +++ b/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 \ diff --git a/README.md b/README.md index fb1cb7b..0ea082b 100644 --- a/README.md +++ b/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. diff --git a/readme-vars.yml b/readme-vars.yml index 891490b..0ed45e3 100644 --- a/readme-vars.yml +++ b/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." } \ No newline at end of file + - { date: "14.06.21:", desc: "Initial Release." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-phpmyadmin-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-phpmyadmin-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-config b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run old mode 100644 new mode 100755 similarity index 80% rename from root/etc/cont-init.d/50-config rename to root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run index b8c8ff1..5693a29 --- a/root/etc/cont-init.d/50-config +++ b/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 </dev/null;then echo "updating root in ${DEFAULT_CONF}" sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" fi