From 61b290e22034cdccde96a68c405fff54aff2e1ae Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 28 Mar 2023 08:49:58 +1000 Subject: [PATCH 1/5] Chown each folder on separately Really not sure why this fixes #2734 however it does actually help the ownership script succeed specifically on arm7/raspbian --- .../s6-rc.d/prepare/30-ownership.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh index f415979..ea45511 100755 --- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh @@ -9,13 +9,12 @@ log_info 'Setting ownership ...' chown root /tmp/nginx # npmuser -chown -R npmuser:npmuser \ - /data \ - /etc/letsencrypt \ - /etc/nginx \ - /run/nginx \ - /tmp/nginx \ - /var/cache/nginx \ - /var/lib/logrotate \ - /var/lib/nginx \ - /var/log/nginx +chown -R npmuser:npmuser /data +chown -R npmuser:npmuser /etc/letsencrypt +chown -R npmuser:npmuser /etc/nginx +chown -R npmuser:npmuser /run/nginx +chown -R npmuser:npmuser /tmp/nginx +chown -R npmuser:npmuser /var/cache/nginx +chown -R npmuser:npmuser /var/lib/logrotate +chown -R npmuser:npmuser /var/lib/nginx +chown -R npmuser:npmuser /var/log/nginx From 35abb4d7ae4334122d634c4f9e51b1f0531425e9 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 28 Mar 2023 09:33:30 +1000 Subject: [PATCH 2/5] Execute permissions missing on script --- docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh old mode 100644 new mode 100755 From d179887c15ac0d8a7822da7b6be36ae5055ef419 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 28 Mar 2023 10:39:26 +1000 Subject: [PATCH 3/5] Another fix for #2734, only chown parts of /etc/nginx --- docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh index ea45511..3eddafd 100755 --- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh @@ -11,10 +11,13 @@ chown root /tmp/nginx # npmuser chown -R npmuser:npmuser /data chown -R npmuser:npmuser /etc/letsencrypt -chown -R npmuser:npmuser /etc/nginx chown -R npmuser:npmuser /run/nginx chown -R npmuser:npmuser /tmp/nginx chown -R npmuser:npmuser /var/cache/nginx chown -R npmuser:npmuser /var/lib/logrotate chown -R npmuser:npmuser /var/lib/nginx chown -R npmuser:npmuser /var/log/nginx + +# Don't chown entire /etc/nginx folder as this causes crashes on some systems +chown -R npmuser:npmuser /etc/nginx/nginx.conf +chown -R npmuser:npmuser /etc/nginx/conf.d From 7f5e0414ac05fc9c3ad834fed083033cbdfce50e Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 29 Mar 2023 07:22:15 +1000 Subject: [PATCH 4/5] Bump version --- .version | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 10c2c0c..8bbb6e4 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.10.0 +2.10.1 diff --git a/README.md b/README.md index e74e6cc..d5a7473 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + From 91cf3c887394864a388f52c956933f197fbc8b8c Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 29 Mar 2023 08:24:28 +1000 Subject: [PATCH 5/5] Tweaks to docker compose ci after updates --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2385aef..cb597eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,13 +90,13 @@ pipeline { steps { // Bring up a stack sh 'docker-compose up -d fullstack-sqlite' - sh './scripts/wait-healthy $(docker-compose ps -q fullstack-sqlite) 120' + sh './scripts/wait-healthy $(docker-compose ps --all -q fullstack-sqlite) 120' // Run tests sh 'rm -rf test/results' sh 'docker-compose up cypress-sqlite' // Get results - sh 'docker cp -L "$(docker-compose ps -q cypress-sqlite):/test/results" test/' + sh 'docker cp -L "$(docker-compose ps --all -q cypress-sqlite):/test/results" test/' } post { always { @@ -116,13 +116,13 @@ pipeline { steps { // Bring up a stack sh 'docker-compose up -d fullstack-mysql' - sh './scripts/wait-healthy $(docker-compose ps -q fullstack-mysql) 120' + sh './scripts/wait-healthy $(docker-compose ps --all -q fullstack-mysql) 120' // Run tests sh 'rm -rf test/results' sh 'docker-compose up cypress-mysql' // Get results - sh 'docker cp -L "$(docker-compose ps -q cypress-mysql):/test/results" test/' + sh 'docker cp -L "$(docker-compose ps --all -q cypress-mysql):/test/results" test/' } post { always {