Commit 7c116162 authored by ale's avatar ale
Browse files

Use apache2-php-base as base image

parent 1d507bb9
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 conf /tmp/conf
COPY build/src /var/www/webmail COPY build/src /var/www/webmail
......
...@@ -15,8 +15,6 @@ BUILD_PACKAGES="rsync" ...@@ -15,8 +15,6 @@ BUILD_PACKAGES="rsync"
# addition to those already installed by the base apache2 image. # addition to those already installed by the base apache2 image.
PACKAGES=" PACKAGES="
libapache2-mod-sso libapache2-mod-sso
php-mysql
php-gd
php-imap php-imap
php-mcrypt php-mcrypt
php-mbstring php-mbstring
...@@ -31,22 +29,11 @@ APACHE_MODULES_ENABLE=" ...@@ -31,22 +29,11 @@ APACHE_MODULES_ENABLE="
sso sso
unique_id 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. # Sites to enable.
APACHE_SITES=" APACHE_SITES="
webmail webmail
" "
export APACHE_SITES
# Use php-fpm.
export PHP_FPM_ENABLE=1
# The default bitnami/minideb image defines an 'install_packages' # The default bitnami/minideb image defines an 'install_packages'
# command which is just a convenient helper. Define our own in # command which is just a convenient helper. Define our own in
...@@ -65,7 +52,8 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES} ...@@ -65,7 +52,8 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES}
rsync -a /tmp/conf/ /etc/ rsync -a /tmp/conf/ /etc/
# Setup Apache. # Setup Apache.
/usr/local/bin/setup-apache.sh a2enmod -q ${APACHE_MODULES_ENABLE}
a2ensite ${APACHE_SITES}
# Ensure that the startup script is executable. # Ensure that the startup script is executable.
chmod 755 /start.sh chmod 755 /start.sh
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment