Upgrading to Version 3.15.3+181108

Add socket check before waiting for database connection

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                             |

apache/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.2-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.14.4+180810'
+ARG version='3.15.3+181108'
 
 # Install OS dependencies
 RUN apt-get update && \

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
+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
+    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

fpm-alpine/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.2-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.14.4+180810'
+ARG version='3.15.3+181108'
 
 # Install OS dependencies
 RUN apk add --no-cache --virtual .build-deps \

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
+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
+    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

fpm/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.2-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.14.4+180810'
+ARG version='3.15.3+181108'
 
 # Install OS dependencies
 RUN apt-get update && \

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
+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
+    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

upgrade.py

@@ -8,6 +8,7 @@ import subprocess
 
 dockerfile_apache = 'apache/Dockerfile'
 dockerfile_fpm = 'fpm/Dockerfile'
+dockerfile_alpine = 'fpm-alpine/Dockerfile'
 
 limesv_feed_url = 'https://github.com/LimeSurvey/LimeSurvey/releases.atom'
 docker_feed_url = 'https://github.com/martialblog/docker-limesurvey/releases.atom'
@@ -39,6 +40,7 @@ commit_message = 'Updating to Version {}'.format(limesv_current_release)
 regexp = 's/[0-9]+\.[0-9]+\.[0-9]+[0-9]*/{new_version}/'.format(new_version=limesv_current_release)
 subprocess.call(['sed', '-i', '-e',  regexp, dockerfile_apache])
 subprocess.call(['sed', '-i', '-e',  regexp, dockerfile_fpm])
+subprocess.call(['sed', '-i', '-e',  regexp, dockerfile_alpine])
 print('> Updated Dockerfiles')
 
 # Git Commit/Tag