Merge pull request #52 from linuxserver/master-3.11

Master 3.11

Author: tobbenb

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:3.10
+FROM lsiobase/nginx:3.11
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:arm64v8-3.10
+FROM lsiobase/nginx:arm64v8-3.11
 
 # set version label
 ARG BUILD_DATE

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:arm32v7-3.10
+FROM lsiobase/nginx:arm32v7-3.11
 
 # set version label
 ARG BUILD_DATE

Jenkinsfile

@@ -29,13 +29,11 @@ pipeline {
     DIST_IMAGE = 'alpine'
     MULTIARCH = 'true'
     CI = 'true'
-    CI_WEB = 'true'
+    CI_WEB = 'false'
     CI_PORT = '80'
     CI_SSL = 'false'
     CI_DELAY = '120'
-    TEST_MYSQL_HOST = credentials('mysql_test_host')
-    TEST_MYSQL_PASSWORD = credentials('mysql_test_password')
-    CI_DOCKERENV = 'DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}'
+    CI_DOCKERENV = 'CI_RUN=true'
     CI_AUTH = 'user:password'
     CI_WEBPATH = ''
   }

jenkins-vars.yml

@@ -20,12 +20,10 @@ repo_vars:
   - DIST_IMAGE = 'alpine'
   - MULTIARCH = 'true'
   - CI = 'true'
-  - CI_WEB = 'true'
+  - CI_WEB = 'false'
   - CI_PORT = '80'
   - CI_SSL = 'false'
   - CI_DELAY = '120'
-  - TEST_MYSQL_HOST = credentials('mysql_test_host')
-  - TEST_MYSQL_PASSWORD = credentials('mysql_test_password')
-  - CI_DOCKERENV = 'DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}'
+  - CI_DOCKERENV = 'CI_RUN=true'
   - CI_AUTH = 'user:password'
   - CI_WEBPATH = ''

readme-vars.yml

@@ -100,6 +100,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "14.06.19:", desc: "Add wkhtmltopdf to image for PDF rendering." }

root/etc/cont-init.d/50-config

@@ -57,11 +57,9 @@ fi
 
 # check for the mysql endpoint for 30 seconds
 END=$((SECONDS+30))
-while [ ${SECONDS} -lt ${END} ] && [ "${DB_HOST}" ];
-	do
+while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do
 	/usr/bin/nc -z ${DB_HOST} 3306 && \
-	if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST} 3306)" ];
-		then
+	if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST} 3306)" ]; then
 		[ ! -z "${RUN}" ] && break
 		RUN="RAN"
 		# we sleep here again due to first run init on DB containers
@@ -73,7 +71,9 @@ while [ ${SECONDS} -lt ${END} ] && [ "${DB_HOST}" ];
 done
 
 # update database - will set up database if fresh, or, migrate existing
-php /var/www/html/artisan migrate --force
+if [ -z "${CI_RUN+x}" ]; then
+	php /var/www/html/artisan migrate --force
+fi
 
 # set permissions
 chown -R abc:abc \