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 c9f5748..c170dc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -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 @@ -10,19 +12,16 @@ LABEL maintainer="gilbn" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php8 \ - php8-sqlite3 \ - php8-mysqli \ - php8-pdo_mysql \ - php8-pdo_sqlite \ - php8-gd \ - php8-json \ - php8-fileinfo \ - php8-zip \ - php8-ftp \ - php8-ldap \ - php8-tokenizer \ - php8-intl && \ + php81-sqlite3 \ + php81-mysqli \ + php81-pdo_mysql \ + php81-pdo_sqlite \ + php81-gd \ + php81-zip \ + php81-ftp \ + php81-ldap \ + php81-tokenizer \ + php81-intl && \ echo "**** install xbackbone ****" && \ mkdir -p /app/www/public && \ if [ -z ${XBACKBONE_RELEASE+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8fb8e73..3231da4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -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 @@ -10,19 +12,16 @@ LABEL maintainer="gilbn" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php8 \ - php8-sqlite3 \ - php8-mysqli \ - php8-pdo_mysql \ - php8-pdo_sqlite \ - php8-gd \ - php8-json \ - php8-fileinfo \ - php8-zip \ - php8-ftp \ - php8-ldap \ - php8-tokenizer \ - php8-intl && \ + php81-sqlite3 \ + php81-mysqli \ + php81-pdo_mysql \ + php81-pdo_sqlite \ + php81-gd \ + php81-zip \ + php81-ftp \ + php81-ldap \ + php81-tokenizer \ + php81-intl && \ echo "**** install xbackbone ****" && \ mkdir -p /app/www/public && \ if [ -z ${XBACKBONE_RELEASE+x} ]; then \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 876d40d..0a4b3ae 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -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 @@ -10,19 +12,16 @@ LABEL maintainer="gilbn" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php8 \ - php8-sqlite3 \ - php8-mysqli \ - php8-pdo_mysql \ - php8-pdo_sqlite \ - php8-gd \ - php8-json \ - php8-fileinfo \ - php8-zip \ - php8-ftp \ - php8-ldap \ - php8-tokenizer \ - php8-intl && \ + php81-sqlite3 \ + php81-mysqli \ + php81-pdo_mysql \ + php81-pdo_sqlite \ + php81-gd \ + php81-zip \ + php81-ftp \ + php81-ldap \ + php81-tokenizer \ + php81-intl && \ echo "**** install xbackbone ****" && \ mkdir -p /app/www/public && \ if [ -z ${XBACKBONE_RELEASE+x} ]; then \ diff --git a/README.md b/README.md index a7f0949..4d9c0ca 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.01.23:** - Rebase to alpine 3.17 with php8.1. * **04.11.22:** - Rebase to Alpine 3.16, migrate to s6v3. * **01.11.22:** - Move application install to /app/www/public, add migration notices for existing users. Container updates should now update the application correctly * **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)). diff --git a/readme-vars.yml b/readme-vars.yml index 8876fa8..b53aaa6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "04.11.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." } - { date: "01.11.22:", desc: "Move application install to /app/www/public, add migration notices for existing users. Container updates should now update the application correctly" } - { 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))." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/dependencies.d/init-nginx-end similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/dependencies.d/init-config rename to root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/dependencies.d/init-nginx-end diff --git a/root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/run b/root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/run index 1677932..76efbcd 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-xbackbone-config/run @@ -64,5 +64,5 @@ if [[ $(grep -c "/index.php?\$args =404;" /config/nginx/site-confs/default.conf) fi # permissions -chown -R abc:abc \ +lsiown -R abc:abc \ /config