Merge branch 'develop' into staging

* develop:
  update base image

Dockerfile

@@ -1,4 +1,4 @@
-FROM kerstinsieren/alpine-phpfpm-nginx-baseimage:php74-apache-5
+FROM kerstinsieren/alpine-phpfpm-nginx-baseimage:php74-apache-6
 ENV TZ=Europe/Berlin
 COPY . .
 ONBUILD COPY composer.json ./