Use apache2-php-base as base image

Dockerfile

-FROM registry.git.autistici.org/ai3/docker/apache2-base:master
+FROM registry.git.autistici.org/ai3/docker/apache2-php-base:master
 
 COPY conf /tmp/conf
 COPY build/src /var/www/webmail

build.sh

@@ -15,8 +15,6 @@ BUILD_PACKAGES="rsync"
 # addition to those already installed by the base apache2 image.
 PACKAGES="
 	libapache2-mod-sso
-        php-mysql
-        php-gd
         php-imap
         php-mcrypt
 	php-mbstring
@@ -31,22 +29,11 @@ APACHE_MODULES_ENABLE="
 	sso
 	unique_id
 "
-export APACHE_MODULES_ENABLE
-
-# Config snippets to enable for Apache.
-APACHE_CONFIG_ENABLE="
-        php7.0-fpm
-"
-export APACHE_CONFIG_ENABLE
 
 # Sites to enable.
 APACHE_SITES="
 	webmail
 "
-export APACHE_SITES
-
-# Use php-fpm.
-export PHP_FPM_ENABLE=1
 
 # The default bitnami/minideb image defines an 'install_packages'
 # command which is just a convenient helper. Define our own in
@@ -65,7 +52,8 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES}
 rsync -a /tmp/conf/ /etc/
 
 # Setup Apache.
-/usr/local/bin/setup-apache.sh
+a2enmod -q ${APACHE_MODULES_ENABLE}
+a2ensite ${APACHE_SITES}
 
 # Ensure that the startup script is executable.
 chmod 755 /start.sh