Fix Regex in Update script

Add container-structore tests

.gitignore

@@ -0,0 +1,5 @@
+\#*
+.\#*
+
+.venv/
+container-structure-test

.travis.yml

@@ -2,9 +2,10 @@ sudo: required
 language: bash
 services:
   - docker
+
 matrix:
   include:
-    - env: TEST=limesurvey-apache
+    - env: TAG=martialblog/limesurvey-apache
-      script: docker build -t martialblog/limesurvey-apache -f apache/Dockerfile .
+      script: docker build -q -t $TAG -f apache/Dockerfile . && tests/run.sh $TAG
-    - env: TEST=limesurvey-fpm
+    - env: TAG=martialblog/limesurvey-fpm
-      script: docker build -t martialblog/limesurvey-fpm -f fpm/Dockerfile .
+      script: docker build -q -t $TAG -f fpm/Dockerfile . && tests/run.sh $TAG

CONTRIBUTING.md

@@ -0,0 +1,34 @@
+# Contributing
+
+Every Pull Request is welcome.
+
+## Upgrading the Version
+
+To upgrade the LimeSurvey Version the ARG variable needs to be changed.
+
+```bash
+$ grep Agrep ARG apache/Dockerfile
+ARG version='3.7.0+180418'
+```
+
+Since this is a reoccuring and boring task, a script is provided.
+
+```bash
+# Dependencies
+python3 -m venv .venv
+source .venv/bin/activate
+pip3 install -r requirements.txt
+
+# Upgrades to latest Limesurvey version
+./upgrade.py
+```
+
+## Testing
+
+In order to make sure the image works as promised, some tests are provided:
+
+```bash
+./tests/run.sh
+```
+
+For further information:  https://github.com/GoogleContainerTools/container-structure-test

apache/Dockerfile

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

fpm/Dockerfile

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

requirements.txt

@@ -0,0 +1 @@
+feedparser==5.2.1

tests/image_tests.yaml

@@ -0,0 +1,77 @@
+schemaVersion: "2.0.0"
+
+globalEnvVars:
+  - key: "PATH"
+    value: "/env/bin:$PATH"
+
+fileContentTests:
+  - name: 'Limesurvey admin file content'
+    path: '/var/www/html/admin/index.php'
+    expectedContents: ['LimeSurvey']
+
+fileExistenceTests:
+  - name: 'Limesurvey files'
+    path: '/var/www/html/index.php'
+    shouldExist: true
+    permissions: '-rw-rw-r--'
+  - name: 'Limesurvey admin files'
+    path: '/var/www/html/admin/index.php'
+    shouldExist: true
+    permissions: '-rw-rw-r--'
+  - name: 'Ldap syslink'
+    path: '/usr/lib/x86_64-linux-gnu/libldap.so'
+    shouldExist: true
+  - name:  "Dependencies - PHP - gd"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-gd.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - imap"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-imap.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - ldap"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-ldap.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - pgsql"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-pgsql.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - zip"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-zip.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - sodium"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-sodium.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - pdo_mysql"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini'
+    shouldExist: true
+  - name:  "Dependencies - PHP - pdo_pgsql"
+    path: '/usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini'
+    shouldExist: true
+
+commandTests:
+  - name:  "Dependencies - libldap2-dev"
+    command: "dpkg"
+    args: ["-l", "libldap2-dev"]
+    exitCode: 0
+  - name:  "Dependencies - zlib1g-dev"
+    command: "dpkg"
+    args: ["-l", "zlib1g-dev"]
+    exitCode: 0
+  - name:  "Dependencies - libc-client-dev"
+    command: "dpkg"
+    args: ["-l", "libc-client-dev"]
+    exitCode: 0
+  - name:  "Dependencies - libkrb5-dev"
+    command: "dpkg"
+    args: ["-l", "libkrb5-dev"]
+    exitCode: 0
+  - name:  "Dependencies - libpng-dev"
+    command: "dpkg"
+    args: ["-l", "libpng-dev"]
+    exitCode: 0
+  - name:  "Dependencies - libpq-dev"
+    command: "dpkg"
+    args: ["-l", "libpq-dev"]
+    exitCode: 0
+  - name:  "Dependencies - PHP Modules"
+    command: "php"
+    args: ["-m"]
+    expectedOutput: ["ldap", "zip", "pdo_mysql", "pdo_sqlite", "gd", "mbstring", "PDO", "imap"]

tests/run.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+IMAGE=$1
+
+if [ ! -f container-structure-test ]; then
+   curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64
+   mv container-structure-test-linux-amd64 container-structure-test
+   chmod +x container-structure-test
+fi
+
+./container-structure-test test --image $IMAGE --config tests/image_tests.yaml

upgrade.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+
+import argparse
+import feedparser
+import sys
+import subprocess
+
+dockerfile_apache = 'apache/Dockerfile'
+dockerfile_fpm = 'fpm/Dockerfile'
+
+limesv_feed_url = 'https://github.com/LimeSurvey/LimeSurvey/releases.atom'
+docker_feed_url = 'https://github.com/martialblog/docker-limesurvey/releases.atom'
+
+limesv_feed = feedparser.parse(limesv_feed_url)
+docker_feed = feedparser.parse(docker_feed_url)
+
+limesv_current_release = limesv_feed.entries[0].title_detail.value
+docker_current_release = docker_feed.entries[0].title_detail.value
+
+argumentparser = argparse.ArgumentParser(description='Updates the LimeSurvey Version in the Dockerfiles')
+argumentparser.add_argument('--noop', dest='noop', action="store_true", required=False, help="Don't push just commit")
+argumentparser.add_argument('--check', dest='check', action="store_true", required=False, help="Only check if there's a new version available")
+
+cmdargs = argumentparser.parse_args()
+
+if limesv_current_release == docker_current_release:
+    print('Nothing to do.')
+    sys.exit(0)
+
+print('New Version {} available.'.format(limesv_current_release))
+
+if cmdargs.check:
+    sys.exit(0)
+
+commit_message = 'Updating to Version {}'.format(limesv_current_release)
+
+# Dockerfiles
+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])
+print('> Updated Dockerfiles')
+
+# Git Commit/Tag
+# subprocess.call(['git', 'checkout', '-b', limesv_current_release])
+subprocess.call(['git', 'add',  dockerfile_apache])
+subprocess.call(['git', 'add',  dockerfile_fpm])
+subprocess.call(['git', 'commit',  '-m', commit_message])
+subprocess.call(['git', 'tag', limesv_current_release])
+print('> Created new Commit and Tag')
+
+if cmdargs.noop:
+    sys.exit(0)
+
+# Git Push
+# subprocess.call(['git', 'push', 'origin', limesv_current_release])
+subprocess.call(['git', 'push'])
+subprocess.call(['git', 'push', 'origin', '--tags'])
+print('> Pushed to new Branch')
+
+sys.exit(0)