mykitserver/docker-limesurvey
1
0
Fork 0
mirror of https://github.com/mykitserver/docker-limesurvey.git synced 2026-02-06 11:58:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add socket check before waiting for database connection

Browse Source 
database connection checking with netcat is only possible when
using a TCP/IP connection, just launch the application when the
user chooses a unix socket
This commit is contained in:
Jack Henschel
2018-09-14 13:41:47 +02:00
parent 610c377680
commit b443ca12a7
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apache/entrypoint.sh
View File

@@ -5,6 +5,7 @@
DB_TYPE=${DB_TYPE:-'mysql'} DB_TYPE=${DB_TYPE:-'mysql'}
DB_HOST=${DB_HOST:-'mysql'} DB_HOST=${DB_HOST:-'mysql'}
DB_PORT=${DB_PORT:-'3306'} DB_PORT=${DB_PORT:-'3306'}
DB_SOCK=${DB_SOCK:-}
DB_NAME=${DB_NAME:-'limesurvey'} DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'} DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'} DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}
# Check if database is available # Check if database is available
if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT until nc -z -v -w30 $DB_HOST $DB_PORT
do do
echo "Info: Waiting for database connection..." echo "Info: Waiting for database connection..."
sleep 5 sleep 5
done done
fi
# Check if already provisioned # Check if already provisioned

5
fpm-alpine/entrypoint.sh
View File

@@ -1,10 +1,11 @@
#!/bin/sh #!/bin/bash
# Entrypoint for Docker Container # Entrypoint for Docker Container
DB_TYPE=${DB_TYPE:-'mysql'} DB_TYPE=${DB_TYPE:-'mysql'}
DB_HOST=${DB_HOST:-'mysql'} DB_HOST=${DB_HOST:-'mysql'}
DB_PORT=${DB_PORT:-'3306'} DB_PORT=${DB_PORT:-'3306'}
DB_SOCK=${DB_SOCK:-}
DB_NAME=${DB_NAME:-'limesurvey'} DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'} DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'} DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}
# Check if database is available # Check if database is available
if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT until nc -z -v -w30 $DB_HOST $DB_PORT
do do
echo "Info: Waiting for database connection..." echo "Info: Waiting for database connection..."
sleep 5 sleep 5
done done
fi
# Check if already provisioned # Check if already provisioned

3
fpm/entrypoint.sh
View File

@@ -5,6 +5,7 @@
DB_TYPE=${DB_TYPE:-'mysql'} DB_TYPE=${DB_TYPE:-'mysql'}
DB_HOST=${DB_HOST:-'mysql'} DB_HOST=${DB_HOST:-'mysql'}
DB_PORT=${DB_PORT:-'3306'} DB_PORT=${DB_PORT:-'3306'}
DB_SOCK=${DB_SOCK:-}
DB_NAME=${DB_NAME:-'limesurvey'} DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'} DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'} DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}
# Check if database is available # Check if database is available
if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT until nc -z -v -w30 $DB_HOST $DB_PORT
do do
echo "Info: Waiting for database connection..." echo "Info: Waiting for database connection..."
sleep 5 sleep 5
done done
fi
# Check if already provisioned # Check if already provisioned