Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1371] Removed SSMTP_MAILHUB override. #1377

Merged
merged 1 commit into from
Aug 27, 2024
Merged

[#1371] Removed SSMTP_MAILHUB override. #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .scaffold/tests/bats/docker-compose.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -87,7 +86,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -134,7 +132,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -189,7 +186,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -245,7 +241,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -307,7 +302,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -379,7 +373,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -87,7 +86,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -134,7 +132,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -189,7 +186,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -245,7 +241,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -307,7 +302,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -379,7 +373,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down Expand Up @@ -87,7 +86,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down Expand Up @@ -134,7 +132,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down Expand Up @@ -189,7 +186,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down Expand Up @@ -245,7 +241,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down Expand Up @@ -307,7 +302,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down Expand Up @@ -379,7 +373,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "false",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": "1"
},
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.noenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -87,7 +86,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -134,7 +132,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -189,7 +186,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -245,7 +241,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -307,7 +302,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down Expand Up @@ -379,7 +373,6 @@
"MARIADB_PASSWORD": "drupal",
"MARIADB_PORT": "3306",
"MARIADB_USERNAME": "drupal",
"SSMTP_MAILHUB": "host.docker.internal:1025",
"TZ": "Australia/Melbourne",
"XDEBUG_ENABLE": ""
},
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down