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/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 { diff --git a/README.md b/README.md index e74e6cc..d5a7473 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
-
+
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..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
@@ -9,13 +9,15 @@ 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 /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
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