diff --git a/Dockerfile b/Dockerfile index 87fb1fa..6883e80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.jochum.dev/roundcube/roundcubemail:1.4.8-apache +FROM roundcube/roundcubemail:1.4.11-apache LABEL maintainer="René Jochum " diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 4893140..922f1c3 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,6 +3,15 @@ # PWD=`pwd` +if [ -z "${APT_CACHER}" ]; then + APT_CACHER="apt-cacher.apt-cacher.svc.cluster.local" +fi + +nc -w1 -z ${APT_CACHER} 3142 1>/dev/null 2>&1 && \ + echo 'Acquire::HTTP::Proxy "http://'${APT_CACHER}':3142";' >> /etc/apt/apt.conf.d/01proxy && \ + echo 'Acquire::HTTPS::Proxy "false";' >> /etc/apt/apt.conf.d/01proxy + + if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then if ! [ -e index.php -a -e bin/installto.sh ]; then echo >&2 "roundcubemail not found in $PWD - copying now..." @@ -72,6 +81,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then echo "Write config to $PWD/config/config.inc.php" echo " array('verify_peer' => false, 'verify_peer_name' => false), + 'tls' => array('verify_peer' => false, 'verify_peer_name' => false), + ); + + \$config['smtp_conn_options'] = array( + 'ssl' => array('verify_peer' => false, 'verify_peer_name' => false), + 'tls' => array('verify_peer' => false, 'verify_peer_name' => false), + ); + \$config['db_dsnw'] = '${ROUNDCUBEMAIL_DSNW}'; \$config['db_dsnr'] = '${ROUNDCUBEMAIL_DSNR}'; \$config['default_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}';