Upgrading to Version 3.14.10+180926

Add socket check before waiting for database connection

.travis.yml

@@ -6,6 +6,8 @@ services:
 matrix:
   include:
     - env: TAG=martialblog/limesurvey-apache
-      script: docker build -q -t $TAG -f apache/Dockerfile . && tests/run.sh $TAG
+      script: cd apache; docker build -q -t $TAG . && cd ..; ./tests/run.sh $TAG
     - env: TAG=martialblog/limesurvey-fpm
-      script: docker build -q -t $TAG -f fpm/Dockerfile . && tests/run.sh $TAG
+      script: cd fpm; docker build -q -t $TAG . && cd ..; ./tests/run.sh $TAG
+    - env: TAG=martialblog/limesurvey-alpine
+      script: cd fpm; docker build -q -t $TAG . && cd ..; ./tests/run.sh $TAG

README.md

@@ -45,9 +45,10 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
 
 | Parameter       | Description                               |
 | ---------       | -----------                               |
-| DB_TYPE         | Database Type to use. mysql or postgresql |
+| 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.13.1+180629'
+ARG version='3.14.10+180926'
 
 # Install OS dependencies
 RUN apt-get update && \

apache/entrypoint.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
+# Entrypoint for Docker Container
 
-set -e
 
 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'}
@@ -19,17 +20,15 @@ PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
 
-# Check if DB_PASSWORD is set
-if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
-    exit 1
+# 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 DB_PASSWORD is set
-if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
-    exit 1
-fi
 
 # Check if already provisioned
 if [ -f application/config/config.php ]; then
@@ -43,14 +42,21 @@ else
         cp application/config/config-sample-mysql.php application/config/config.php
     fi
 
-    if [ "$DB_TYPE" = 'postgresql' ]; then
+    if [ "$DB_TYPE" = 'pgsql' ]; then
         echo 'Info: Using PostgreSQL configuration'
         DB_CHARSET=${DB_CHARSET:-'utf8'}
         cp application/config/config-sample-pgsql.php application/config/config.php
     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
@@ -66,14 +72,30 @@ else
     fi
 fi
 
-until nc -z -v -w30 $DB_HOST $DB_PORT
-do
-    echo "Info: Waiting for database connection..."
-    sleep 5
-done
 
-echo 'Running console.php install'
-# Hint: The console.php script seems to always exit with 1, so that is why
-php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL || true
+# Check if LimeSurvey database is provisioned
+echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
+php application/commands/console.php updatedb
+
+
+if [ $? -eq 0 ]; then
+    echo 'Info: Database already provisioned'
+else
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
 
 exec "$@"

docker-compose.fpm.alpine.yml

@@ -0,0 +1,35 @@
+version: "3.0"
+services:
+  limesurvey:
+    build:
+      context: fpm-alpine/
+      dockerfile: Dockerfile
+    volumes:
+      - /tmp/upload/:/var/www/html/upload/
+      - lime:/var/www/html
+    links:
+      - lime-db
+    depends_on:
+      - lime-db
+    environment:
+      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_PASSWORD=secret"
+      - "ADMIN_PASSWORD=foobar"
+  lime-web:
+    image: nginx:alpine
+    links:
+      - limesurvey
+    ports:
+      - "8080:80"
+    volumes:
+      - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
+      - lime:/var/www/html
+  lime-db:
+    image: mysql:5.7
+    environment:
+      - "MYSQL_USER=limesurvey"
+      - "MYSQL_DATABASE=limesurvey"
+      - "MYSQL_PASSWORD=secret"
+      - "MYSQL_ROOT_PASSWORD=secret"
+volumes:
+  lime:

docker-compose.fpm.yml

@@ -2,8 +2,8 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: .
-      dockerfile: fpm/Dockerfile
+      context: fpm/
+      dockerfile: Dockerfile
     volumes:
       - /tmp/upload/:/var/www/html/upload/
       - lime:/var/www/html

docker-compose.pgsql.yml

@@ -0,0 +1,26 @@
+version: "3.0"
+services:
+  limesurvey:
+    build:
+      context: apache/
+      dockerfile: Dockerfile
+    volumes:
+      - /tmp/upload/:/var/www/html/upload/
+    links:
+      - lime-db
+    depends_on:
+      - lime-db
+    ports:
+      - "8080:80"
+    environment:
+      - "DB_TYPE=pgsql"
+      - "DB_PORT=5432"
+      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_PASSWORD=secret"
+      - "ADMIN_PASSWORD=foobar"
+  lime-db:
+    image: postgres:10
+    environment:
+      - "POSTGRES_USER=limesurvey"
+      - "POSTGRES_DB=limesurvey"
+      - "POSTGRES_PASSWORD=secret"

docker-compose.yml

@@ -2,8 +2,8 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: .
-      dockerfile: apache/Dockerfile
+      context: apache/
+      dockerfile: Dockerfile
     volumes:
       - /tmp/upload/:/var/www/html/upload/
     links:

fpm-alpine/Dockerfile

@@ -0,0 +1,41 @@
+FROM php:7.2-fpm-alpine
+LABEL maintainer="markus@martialblog.de"
+ARG version='3.14.10+180926'
+
+# Install OS dependencies
+RUN apk add --no-cache --virtual .build-deps \
+    libpng-dev \
+    openldap-dev \
+    imap-dev \
+    postgresql-dev && \
+    apk add --no-cache netcat-openbsd bash
+
+# Install PHP Plugins
+RUN docker-php-ext-configure imap --with-imap-ssl && \
+    docker-php-ext-install \
+    gd \
+    imap \
+    ldap \
+    mbstring \
+    pdo \
+    pdo_mysql \
+    pdo_pgsql \
+    pgsql \
+    zip
+
+# Download, unzip and chmod of LimeSurvey
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+    rm -rf "/tmp/${version}.tar.gz" \
+    /var/www/html/docs \
+    /var/www/html/tests \
+    /var/www/html/*.md && \
+    chown -R www-data:root /var/www/ ; \
+    chmod -R g=u /var/www
+
+EXPOSE 9000
+
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

fpm-alpine/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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'}
+DB_PASSWORD=${DB_PASSWORD:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+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
+if [ -f application/config/config.php ]; then
+    echo 'Info: config.php already provisioned'
+else
+    echo 'Info: Generating config.php'
+
+    if [ "$DB_TYPE" = 'mysql' ]; then
+        echo 'Info: Using MySQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8mb4'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    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
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    fi
+fi
+
+
+# Check if LimeSurvey database is provisioned
+echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
+php application/commands/console.php updatedb
+
+
+if [ $? -eq 0 ]; then
+    echo 'Info: Database already provisioned'
+else
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

fpm/Dockerfile

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

fpm/entrypoint.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
+# Entrypoint for Docker Container
 
-set -e
 
 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'}
@@ -19,17 +20,15 @@ PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
 
-# Check if DB_PASSWORD is set
-if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
-    exit 1
+# 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 DB_PASSWORD is set
-if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
-    exit 1
-fi
 
 # Check if already provisioned
 if [ -f application/config/config.php ]; then
@@ -43,14 +42,21 @@ else
         cp application/config/config-sample-mysql.php application/config/config.php
     fi
 
-    if [ "$DB_TYPE" = 'postgresql' ]; then
+    if [ "$DB_TYPE" = 'pgsql' ]; then
         echo 'Info: Using PostgreSQL configuration'
         DB_CHARSET=${DB_CHARSET:-'utf8'}
         cp application/config/config-sample-pgsql.php application/config/config.php
     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
@@ -66,14 +72,30 @@ else
     fi
 fi
 
-until nc -z -v -w30 $DB_HOST $DB_PORT
-do
-    echo "Info: Waiting for database connection..."
-    sleep 5
-done
 
-echo 'Running console.php install'
-# Hint: The console.php script seems to always exit with 1, so that is why
-php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL || true
+# Check if LimeSurvey database is provisioned
+echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
+php application/commands/console.php updatedb
+
+
+if [ $? -eq 0 ]; then
+    echo 'Info: Database already provisioned'
+else
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
 
 exec "$@"

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