Skip to content

Commit

Permalink
[#1371] Removed SSMTP_MAILHUB override.
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexSkrypnyk
AlexSkrypnyk committed Aug 27, 2024
1 parent 14454b2 commit 90b881e
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 31 deletions.
1 change: 0 additions & 1 deletion .scaffold/tests/bats/docker-compose.bats
View file
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
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
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
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
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
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

1 comment on commit 90b881e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Published on https://drevops-scaffold-docs.netlify.app as production
🚀 Deployed on https://66ce5038f3cc21a0f00ee239--drevops-scaffold-docs.netlify.app

Please sign in to comment.