From 9380a5457eede04f2a7a60c8a73b9d5b559f2823 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 19 Jan 2023 20:32:24 -0600 Subject: [PATCH 1/2] Rebase to alpine 3.17 with php8.1 --- .github/workflows/call_invalid_helper.yml | 12 +++++++ Dockerfile | 32 ++++++++----------- Dockerfile.aarch64 | 32 ++++++++----------- Dockerfile.armhf | 32 ++++++++----------- README.md | 1 + readme-vars.yml | 1 + .../dependencies.d/init-nginx-end | 0 .../s6-rc.d/init-cops-config/run} | 7 ++-- .../s6-overlay/s6-rc.d/init-cops-config/type | 1 + .../s6-overlay/s6-rc.d/init-cops-config/up | 1 + .../s6-rc.d/user/contents.d/init-cops-config | 0 11 files changed, 61 insertions(+), 58 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml create mode 100644 root/etc/s6-overlay/s6-rc.d/init-cops-config/dependencies.d/init-nginx-end rename root/etc/{cont-init.d/40-config => s6-overlay/s6-rc.d/init-cops-config/run} (86%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-cops-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-cops-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-cops-config 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 e075c49..33ebfcf 100644 --- 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 @@ -8,23 +10,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --upgrade --virtual=build-dependencies \ - curl \ - tar && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - php8-ctype \ - php8-dom \ - php8-gd \ - php8-intl \ - php8-mbstring \ - php8-opcache \ - php8-openssl \ - php8-phar \ - php8-pdo_sqlite \ - php8-zip \ - php8-zlib && \ + php81-ctype \ + php81-dom \ + php81-gd \ + php81-intl \ + php81-mbstring \ + php81-opcache \ + php81-openssl \ + php81-phar \ + php81-pdo_sqlite \ + php81-zip \ + php81-zlib && \ echo "**** install cops ****" && \ curl \ -sS https://getcomposer.org/installer \ @@ -47,8 +45,6 @@ RUN \ install --no-dev --optimize-autoloader && \ sed -i 's|^[[:space:]]*return[[:space:]]@create_function[[:space:]]'\(''\''\$it'\'',[[:space:]]\$func'\)';| return function \(\$it\) use \(\$func\) \{\n return eval\(\$func\);\n \};|' vendor/seblucas/dot-php/doT.php && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.composer \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 355b355..36b9242 100644 --- 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 @@ -8,23 +10,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --upgrade --virtual=build-dependencies \ - curl \ - tar && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - php8-ctype \ - php8-dom \ - php8-gd \ - php8-intl \ - php8-mbstring \ - php8-opcache \ - php8-openssl \ - php8-phar \ - php8-pdo_sqlite \ - php8-zip \ - php8-zlib && \ + php81-ctype \ + php81-dom \ + php81-gd \ + php81-intl \ + php81-mbstring \ + php81-opcache \ + php81-openssl \ + php81-phar \ + php81-pdo_sqlite \ + php81-zip \ + php81-zlib && \ echo "**** install cops ****" && \ curl \ -sS https://getcomposer.org/installer \ @@ -47,8 +45,6 @@ RUN \ install --no-dev --optimize-autoloader && \ sed -i 's|^[[:space:]]*return[[:space:]]@create_function[[:space:]]'\(''\''\$it'\'',[[:space:]]\$func'\)';| return function \(\$it\) use \(\$func\) \{\n return eval\(\$func\);\n \};|' vendor/seblucas/dot-php/doT.php && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.composer \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 63acecc..350e1f6 100644 --- 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 @@ -8,23 +10,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --upgrade --virtual=build-dependencies \ - curl \ - tar && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - php8-ctype \ - php8-dom \ - php8-gd \ - php8-intl \ - php8-mbstring \ - php8-opcache \ - php8-openssl \ - php8-phar \ - php8-pdo_sqlite \ - php8-zip \ - php8-zlib && \ + php81-ctype \ + php81-dom \ + php81-gd \ + php81-intl \ + php81-mbstring \ + php81-opcache \ + php81-openssl \ + php81-phar \ + php81-pdo_sqlite \ + php81-zip \ + php81-zlib && \ echo "**** install cops ****" && \ curl \ -sS https://getcomposer.org/installer \ @@ -47,8 +45,6 @@ RUN \ install --no-dev --optimize-autoloader && \ sed -i 's|^[[:space:]]*return[[:space:]]@create_function[[:space:]]'\(''\''\$it'\'',[[:space:]]\$func'\)';| return function \(\$it\) use \(\$func\) \{\n return eval\(\$func\);\n \};|' vendor/seblucas/dot-php/doT.php && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.composer \ /tmp/* diff --git a/README.md b/README.md index a15b583..761a769 100644 --- a/README.md +++ b/README.md @@ -257,6 +257,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.08.22:** - Rebase to alpine 3.17 with php8.1. * **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)). * **22.11.20:** - Pin composer version to 1.10.17. * **01.06.20:** - Rebasing to alpine 3.12. diff --git a/readme-vars.yml b/readme-vars.yml index 150b147..361e3d6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -84,6 +84,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.08.22:", desc: "Rebase to alpine 3.17 with php8.1." } - { 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: "22.11.20:", desc: "Pin composer version to 1.10.17." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-cops-config/dependencies.d/init-nginx-end b/root/etc/s6-overlay/s6-rc.d/init-cops-config/dependencies.d/init-nginx-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/40-config b/root/etc/s6-overlay/s6-rc.d/init-cops-config/run similarity index 86% rename from root/etc/cont-init.d/40-config rename to root/etc/s6-overlay/s6-rc.d/init-cops-config/run index 07560dc..7ac7e35 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/s6-overlay/s6-rc.d/init-cops-config/run @@ -22,7 +22,6 @@ for f in /config/config_local*.php; do cp "$f" /app/www/public/ done -# permissions -chown -R abc:abc \ - /config \ - /app/www/public +# permissions +lsiown -R abc:abc \ + /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-cops-config/type b/root/etc/s6-overlay/s6-rc.d/init-cops-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-cops-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-cops-config/up b/root/etc/s6-overlay/s6-rc.d/init-cops-config/up new file mode 100644 index 0000000..6c4267c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-cops-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-cops-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-cops-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-cops-config new file mode 100644 index 0000000..e69de29 From 2d1273719877d5edeef73f4d7ed192ee47f63dd4 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 19 Jan 2023 20:37:30 -0600 Subject: [PATCH 2/2] Fix date --- README.md | 2 +- readme-vars.yml | 2 +- root/etc/s6-overlay/s6-rc.d/init-cops-config/run | 0 3 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 root/etc/s6-overlay/s6-rc.d/init-cops-config/run diff --git a/README.md b/README.md index 761a769..dece157 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **20.08.22:** - Rebase to alpine 3.17 with php8.1. +* **19.01.23:** - Rebase to alpine 3.17 with php8.1. * **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)). * **22.11.20:** - Pin composer version to 1.10.17. * **01.06.20:** - Rebasing to alpine 3.12. diff --git a/readme-vars.yml b/readme-vars.yml index 361e3d6..102db9b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -84,7 +84,7 @@ app_setup_block: | # changelog changelogs: - - { date: "20.08.22:", desc: "Rebase to alpine 3.17 with php8.1." } + - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { 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: "22.11.20:", desc: "Pin composer version to 1.10.17." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-cops-config/run b/root/etc/s6-overlay/s6-rc.d/init-cops-config/run old mode 100644 new mode 100755