1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-06 16:07:22 +01:00

merge: @PirosB3 and @pjz suggested using pjzz/phusion-baseimage as the base image for docker

See http://phusion.github.io/baseimage-docker/ for why the stock Ubuntu
image from Docker is not good enough for a complex system.

Thanks to @pjz for updating the base image for Ubuntu 14.04 and starting
the service scripts.

see #16; merges #49
This commit is contained in:
Joshua Tauberer
2014-05-06 10:05:14 -04:00
6 changed files with 126 additions and 66 deletions

View File

@@ -52,6 +52,17 @@ PUBLIC_HOSTNAME=$PUBLIC_HOSTNAME
PUBLIC_IP=$PUBLIC_IP
EOF
# For docker, we don't want any of our scripts to start daemons.
# Mask the 'service' program by defining a function of the same name
# so that whenever we try to restart a service we just silently do
# nothing.
if [ "$NO_RESTART_SERVICES" == "1" ]; then
function service {
# we could output some status, but it's not important
echo skipping service $@ > /dev/null;
}
fi
# Start service configuration.
. scripts/system.sh
. scripts/dns.sh

View File

@@ -2,8 +2,8 @@ source scripts/functions.sh # load our functions
# Base system configuration.
apt-get -q -q update
apt-get -q -y upgrade
apt-get -qq update
apt-get -qq -y upgrade
# Install openssh-server to ensure that the end result is consistent across all Mail-in-a-Boxes.
apt_install openssh-server