diff --git a/.scaffold/tests/bats/docker-compose.bats b/.scaffold/tests/bats/docker-compose.bats index 4d8bf61fd..7673a0009 100644 --- a/.scaffold/tests/bats/docker-compose.bats +++ b/.scaffold/tests/bats/docker-compose.bats @@ -53,7 +53,6 @@ load _helper.bash echo "DREVOPS_WEBROOT=docroot" >>.env echo "DREVOPS_DB_IMAGE=myorg/my_db_image" >>.env echo "XDEBUG_ENABLE=1" >>.env - echo "SSMTP_MAILHUB=false" >>.env echo "DRUPAL_SHIELD_USER=jane" >>.env echo "DRUPAL_SHIELD_PASS=passw" >>.env echo "DRUPAL_REDIS_ENABLED=1" >>.env diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env.json b/.scaffold/tests/bats/fixtures/docker-compose.env.json index 28ac43b00..deb56af4e 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env.json @@ -37,7 +37,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -87,7 +86,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -134,7 +132,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -189,7 +186,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -245,7 +241,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -307,7 +302,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -379,7 +373,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json index 28ac43b00..deb56af4e 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json @@ -37,7 +37,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -87,7 +86,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -134,7 +132,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -189,7 +186,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -245,7 +241,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -307,7 +302,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -379,7 +373,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json index 4ded1d559..7a346e32a 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json @@ -37,7 +37,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, @@ -87,7 +86,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, @@ -134,7 +132,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, @@ -189,7 +186,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, @@ -245,7 +241,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, @@ -307,7 +302,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, @@ -379,7 +373,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "false", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "1" }, diff --git a/.scaffold/tests/bats/fixtures/docker-compose.noenv.json b/.scaffold/tests/bats/fixtures/docker-compose.noenv.json index b335c69b1..e73841ca2 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.noenv.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.noenv.json @@ -37,7 +37,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -87,7 +86,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -134,7 +132,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -189,7 +186,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -245,7 +241,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -307,7 +302,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, @@ -379,7 +373,6 @@ "MARIADB_PASSWORD": "drupal", "MARIADB_PORT": "3306", "MARIADB_USERNAME": "drupal", - "SSMTP_MAILHUB": "host.docker.internal:1025", "TZ": "Australia/Melbourne", "XDEBUG_ENABLE": "" }, diff --git a/docker-compose.yml b/docker-compose.yml index 3e1f0ca0a..500283602 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,8 +60,6 @@ x-environment: &default-environment XDEBUG_ENABLE: ${XDEBUG_ENABLE:-} # Pass-through 'CI' variable used to identify the CI environment. CI: ${CI:-} - # Forward emails to Mailhog locally. - SSMTP_MAILHUB: ${SSMTP_MAILHUB:-host.docker.internal:1025} # Path to configuration files. DRUPAL_CONFIG_PATH: ${DRUPAL_CONFIG_PATH:-/app/config/default} # Drupal file paths.