adding working gaurd and ci run concept that just starts the nginx process skipping mysql stuff

This commit is contained in:
thelamer 2019-12-20 08:34:52 -08:00
parent 185dabdab3
commit 4f61df3b9a
3 changed files with 9 additions and 13 deletions

6
Jenkinsfile vendored
View File

@ -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 = ''
}

View File

@ -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 = ''

View File

@ -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 \