diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ 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/Dockerfile b/Dockerfile index b6cbee0..e598a78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,15 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16 +# syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17 + +# set version label ARG BUILD_DATE ARG VERSION ARG PHPMYADMIN_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheSpad" +# environment settings ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92" ENV MAX_EXECUTION_TIME 600 ENV MEMORY_LIMIT 512M @@ -17,20 +21,20 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add -U --upgrade --no-cache \ - php8-bz2 \ - php8-curl \ - php8-dom \ - php8-gd \ - php8-iconv \ - php8-mysqli \ - php8-opcache \ - php8-pecl-uploadprogress \ - php8-tokenizer \ - php8-zip && \ + php81-bz2 \ + php81-curl \ + php81-dom \ + php81-gd \ + php81-iconv \ + php81-mysqli \ + php81-opcache \ + php81-pecl-uploadprogress \ + php81-tokenizer \ + php81-zip && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -38,12 +42,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php8/conf.d/opcache-recommended.ini; \ + } > /etc/php81/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php8/conf.d/session-strict.ini; \ + } > /etc/php81/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -52,7 +56,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php8/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php81/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d245621..56ecdac 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,10 +1,15 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17 + +# set version label ARG BUILD_DATE ARG VERSION ARG PHPMYADMIN_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheSpad" +# environment settings ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92" ENV MAX_EXECUTION_TIME 600 ENV MEMORY_LIMIT 512M @@ -16,20 +21,20 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add -U --upgrade --no-cache \ - php8-bz2 \ - php8-curl \ - php8-dom \ - php8-gd \ - php8-iconv \ - php8-mysqli \ - php8-opcache \ - php8-pecl-uploadprogress \ - php8-tokenizer \ - php8-zip && \ + php81-bz2 \ + php81-curl \ + php81-dom \ + php81-gd \ + php81-iconv \ + php81-mysqli \ + php81-opcache \ + php81-pecl-uploadprogress \ + php81-tokenizer \ + php81-zip && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -37,12 +42,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php8/conf.d/opcache-recommended.ini; \ + } > /etc/php81/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php8/conf.d/session-strict.ini; \ + } > /etc/php81/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -51,7 +56,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php8/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php81/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index eb4d5d9..9b74645 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,10 +1,15 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17 + +# set version label ARG BUILD_DATE ARG VERSION ARG PHPMYADMIN_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheSpad" +# environment settings ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92" ENV MAX_EXECUTION_TIME 600 ENV MEMORY_LIMIT 512M @@ -16,20 +21,20 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add -U --upgrade --no-cache \ - php8-bz2 \ - php8-curl \ - php8-dom \ - php8-gd \ - php8-iconv \ - php8-mysqli \ - php8-opcache \ - php8-pecl-uploadprogress \ - php8-tokenizer \ - php8-zip && \ + php81-bz2 \ + php81-curl \ + php81-dom \ + php81-gd \ + php81-iconv \ + php81-mysqli \ + php81-opcache \ + php81-pecl-uploadprogress \ + php81-tokenizer \ + php81-zip && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -37,12 +42,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php8/conf.d/opcache-recommended.ini; \ + } > /etc/php81/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php8/conf.d/session-strict.ini; \ + } > /etc/php81/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -51,7 +56,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php8/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php81/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/README.md b/README.md index 0ea082b..21f84b4 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 +* **20.01.23:** - Rebase to alpine 3.17 with php8.1. * **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. diff --git a/readme-vars.yml b/readme-vars.yml index 0ed45e3..efc519a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { 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." } 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-nginx-end similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/dependencies.d/init-config rename to root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/dependencies.d/init-nginx-end diff --git a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run index 4183d24..0ec0b82 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run @@ -20,6 +20,7 @@ if [ ! -f /config/phpmyadmin/config.inc.php ]; then cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php fi +# permissions lsiown -R abc:abc \ /config \ /app/www/public/tmp