From 381034c9b8a6c18f32d51d36f63a66efca237636 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 18 Nov 2022 16:51:16 +0000 Subject: [PATCH 1/5] Rebase to 3.16, migrate to s6v3 --- Dockerfile | 4 +--- Dockerfile.aarch64 | 4 +--- Dockerfile.armhf | 4 +--- README.md | 1 + readme-vars.yml | 1 + .../init-config-end/dependencies.d/init-phpmyadmin-config | 0 .../s6-rc.d/init-phpmyadmin-config/dependencies.d/init-config | 0 .../s6-rc.d/init-phpmyadmin-config/run} | 4 ++-- root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-phpmyadmin-config | 0 root/migrations/02-default-location | 2 +- 12 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-phpmyadmin-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/dependencies.d/init-config rename root/etc/{cont-init.d/50-config => s6-overlay/s6-rc.d/init-phpmyadmin-config/run} (86%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-phpmyadmin-config 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..7b38d59 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 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 86% rename from root/etc/cont-init.d/50-config rename to root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run index b8c8ff1..221dd40 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run @@ -17,7 +17,7 @@ if [ ! -f /config/phpmyadmin/config.inc.php ]; then cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php fi -chown -R abc:abc \ +lsiown -R abc:abc \ /config -find /app -print0 | xargs -P "$(nproc)" -I {} -0 chown abc:abc {} +find /app -print0 | xargs -P "$(nproc)" -I {} -0 lsiown abc:abc {} diff --git a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up new file mode 100644 index 0000000..81b0e02 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-phpmyadmin-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-phpmyadmin-config new file mode 100644 index 0000000..e69de29 diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index f4079a6..73e77de 100644 --- a/root/migrations/02-default-location +++ b/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 From 1ff394c50d37b1665bac147a9ddae1f18a48a84a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 18 Nov 2022 16:52:28 +0000 Subject: [PATCH 2/5] Trailing newline --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 7b38d59..0ed45e3 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -50,4 +50,4 @@ 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." } From 2bd479595a918acc0fd048dbf5453a856b235f98 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 22 Nov 2022 15:49:13 +0000 Subject: [PATCH 3/5] Increase CI delay --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cadf60a..7bb2bca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { CI_WEB='true' CI_PORT='80' CI_SSL='false' - CI_DELAY='120' + CI_DELAY='240' CI_DOCKERENV='TZ=US/Pacific' CI_AUTH='' CI_WEBPATH='' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 16b5a66..cc6ccbe 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,7 +24,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='80' - CI_SSL='false' - - CI_DELAY='120' + - CI_DELAY='240' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='' - CI_WEBPATH='' From cfbf8224622c5c0be4d95844ab15ad7cd1c08b0e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 22 Nov 2022 16:21:16 +0000 Subject: [PATCH 4/5] Only chown the bits of /app we need to --- root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 221dd40..5693a29 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 @@ -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 < Date: Tue, 22 Nov 2022 16:21:55 +0000 Subject: [PATCH 5/5] Revert CI delay --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7bb2bca..cadf60a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { CI_WEB='true' CI_PORT='80' CI_SSL='false' - CI_DELAY='240' + CI_DELAY='120' CI_DOCKERENV='TZ=US/Pacific' CI_AUTH='' CI_WEBPATH='' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index cc6ccbe..16b5a66 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,7 +24,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='80' - CI_SSL='false' - - CI_DELAY='240' + - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='' - CI_WEBPATH=''