Upgrading to Version 3.14.8+180829

Merge pull request #14 from martialblog/unix-socket
Add socket check before waiting for database connection
2025-12-07 08:59:23 +01:00 · 2018-09-17 17:44:00 +02:00 · 2018-09-15 14:11:12 +02:00 · 2018-09-14 13:41:47 +02:00 · 2018-09-14 09:44:32 +02:00 · 2018-09-14 09:21:04 +02:00
7 changed files with 53 additions and 22 deletions
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
 | DB_TYPE         | Database Type to use. mysql or pgsql      |
 | DB_HOST         | Database server hostname                  |
 | DB_PORT         | Database server port                      |
+| DB_SOCK         | Database unix socket instead of host/port |
 | DB_NAME         | Database name                             |
 | DB_TABLE_PREFIX | Database table prefix                     |
 | DB_USERNAME     | Database user                             |
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:7.2-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.14.5+180815'
+ARG version='3.14.8+180829'

 # Install OS dependencies
 RUN apt-get update && \
--- a/apache/entrypoint.sh
+++ b/apache/entrypoint.sh
@@ -5,6 +5,7 @@
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
 DB_PORT=${DB_PORT:-'3306'}
+DB_SOCK=${DB_SOCK:-}
 DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}


 # Check if database is available
-until nc -z -v -w30 $DB_HOST $DB_PORT
-do
-    echo "Info: Waiting for database connection..."
-    sleep 5
-done
+if [ -z "$DB_SOCK" ]; then
+    until nc -z -v -w30 $DB_HOST $DB_PORT
+    do
+        echo "Info: Waiting for database connection..."
+        sleep 5
+    done
+fi


 # Check if already provisioned
@@ -46,7 +49,14 @@ else
    fi

    # Set Database config
-    sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:7.2-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.14.5+180815'
+ARG version='3.14.8+180829'

 # Install OS dependencies
 RUN apk add --no-cache --virtual .build-deps \
--- a/fpm-alpine/entrypoint.sh
+++ b/fpm-alpine/entrypoint.sh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 # Entrypoint for Docker Container


 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
 DB_PORT=${DB_PORT:-'3306'}
+DB_SOCK=${DB_SOCK:-}
 DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}


 # Check if database is available
-until nc -z -v -w30 $DB_HOST $DB_PORT
-do
-    echo "Info: Waiting for database connection..."
-    sleep 5
-done
+if [ -z "$DB_SOCK" ]; then
+    until nc -z -v -w30 $DB_HOST $DB_PORT
+    do
+        echo "Info: Waiting for database connection..."
+        sleep 5
+    done
+fi


 # Check if already provisioned
@@ -46,7 +49,14 @@ else
    fi

    # Set Database config
-    sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:7.2-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.14.5+180815'
+ARG version='3.14.8+180829'

 # Install OS dependencies
 RUN apt-get update && \
--- a/fpm/entrypoint.sh
+++ b/fpm/entrypoint.sh
@@ -5,6 +5,7 @@
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
 DB_PORT=${DB_PORT:-'3306'}
+DB_SOCK=${DB_SOCK:-}
 DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}


 # Check if database is available
-until nc -z -v -w30 $DB_HOST $DB_PORT
-do
-    echo "Info: Waiting for database connection..."
-    sleep 5
-done
+if [ -z "$DB_SOCK" ]; then
+    until nc -z -v -w30 $DB_HOST $DB_PORT
+    do
+        echo "Info: Waiting for database connection..."
+        sleep 5
+    done
+fi


 # Check if already provisioned
@@ -46,7 +49,14 @@ else
    fi

    # Set Database config
-    sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
Author	SHA1	Message	Date
Markus Opolka	55c23248bd	Upgrading to Version 3.14.8+180829	2018-09-17 17:44:00 +02:00
Markus Opolka	91ab6439de	Merge pull request #14 from martialblog/unix-socket Add socket check before waiting for database connection	2018-09-15 14:11:12 +02:00
Jack Henschel	b443ca12a7	Add socket check before waiting for database connection 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	2018-09-14 13:41:47 +02:00
Markus Opolka	a05a2528c6	Merge pull request #13 from martialblog/unix-socket Add option to use unix_socket instead of tcp connection for DB	2018-09-14 09:44:32 +02:00
Jack Henschel	610c377680	Add option to use unix_socket instead of tcp connection for DB	2018-09-14 09:21:04 +02:00
Markus Opolka	cc34159e53	Upgrading to Version 3.14.7+180827	2018-08-31 11:09:42 +02:00
Markus Opolka	cc6937054e	Upgrading to Version 3.14.6+180821	2018-08-28 11:02:29 +02:00