rename to sendmail

baseimage/initializeBaseUbuntuImage.sh

@@ -178,7 +178,7 @@ else
     docker pull "${GRAPHITE_IMAGE}"
 
     echo "=== Pulling mail relay ==="
-    docker pull "${MAIL_IMAGE}"
+    docker pull "${SENDMAIL_IMAGE}"
 
     echo "=== Pulling recvmail ==="
     docker pull "${RECVMAIL_IMAGE}"

src/INFRA_VERSION

@@ -3,7 +3,7 @@
 # If you change the infra version, be sure to put a warning
 # in the change log
 
-INFRA_VERSION=30
+INFRA_VERSION=31
 
 # WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 # These constants are used in the installer script as well
@@ -12,7 +12,7 @@ MYSQL_IMAGE=cloudron/mysql:0.11.0
 POSTGRESQL_IMAGE=cloudron/postgresql:0.9.0
 MONGODB_IMAGE=cloudron/mongodb:0.9.0
 REDIS_IMAGE=cloudron/redis:0.8.0 # if you change this, fix src/addons.js as well
-MAIL_IMAGE=cloudron/mail:0.12.0
+SENDMAIL_IMAGE=cloudron/sendmail:0.13.0
 GRAPHITE_IMAGE=cloudron/graphite:0.8.0
 RECVMAIL_IMAGE=cloudron/recvmail:0.1.0
 
@@ -20,6 +20,6 @@ MYSQL_REPO=cloudron/mysql
 POSTGRESQL_REPO=cloudron/postgresql
 MONGODB_REPO=cloudron/mongodb
 REDIS_REPO=cloudron/redis # if you change this, fix src/addons.js as well
-MAIL_REPO=cloudron/mail
+SENDMAIL_REPO=cloudron/sendmail
 GRAPHITE_REPO=cloudron/graphite
 RECVMAIL_REPO=cloudron/recvmail

src/scripts/setup_infra.sh

@@ -44,7 +44,7 @@ fi
 # a hack to 'refresh' images when testing with hotfix --recreate-infra
 if [[ -z "${infra_version}" ]]; then
     echo "Removing existing images"
-    docker rmi "${BASE_IMAGE}" "${MYSQL_IMAGE}" "${POSTGRESQL_IMAGE}" "${MONGODB_IMAGE}" "${REDIS_IMAGE}" "${MAIL_IMAGE}" "${GRAPHITE_IMAGE}" "${RECVMAIL_IMAGE}"
+    docker rmi "${BASE_IMAGE}" "${MYSQL_IMAGE}" "${POSTGRESQL_IMAGE}" "${MONGODB_IMAGE}" "${REDIS_IMAGE}" "${SENDMAIL_IMAGE}" "${GRAPHITE_IMAGE}" "${RECVMAIL_IMAGE}"
 fi
 
 # graphite
@@ -95,9 +95,9 @@ mail_container_id=$(docker run --restart=always -d --name="mail" \
     -v "${mail_tls_cert}:/etc/tls_cert.pem:ro" \
     -p 587:2500 \
     --read-only -v /tmp -v /run \
-    "${MAIL_IMAGE}")
+    "${SENDMAIL_IMAGE}")
 echo "Mail container id: ${mail_container_id}"
-if docker images "${MAIL_REPO}" | tail -n +2 | awk '{ print $1 ":" $2 }' | grep -v "${MAIL_IMAGE}" | xargs --no-run-if-empty docker rmi; then
+if docker images "${SENDMAIL_REPO}" | tail -n +2 | awk '{ print $1 ":" $2 }' | grep -v "${SENDMAIL_IMAGE}" | xargs --no-run-if-empty docker rmi; then
     echo "Removed old mail images"
 fi
 

src/test/checkInstall

@@ -62,8 +62,8 @@ if ! docker inspect "${MONGODB_IMAGE}" >/dev/null 2>/dev/null; then
     image_missing="true"
 fi
 
-if ! docker inspect "${MAIL_IMAGE}" >/dev/null 2>/dev/null; then
+if ! docker inspect "${SENDMAIL_IMAGE}" >/dev/null 2>/dev/null; then
-    echo "docker pull ${MAIL_IMAGE}"
+    echo "docker pull ${SENDMAIL_IMAGE}"
     image_missing="true"
 fi