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

refactor!: remove mailhog; use mailpit instead #187

Merged
merged 1 commit into from
May 27, 2024
Merged

refactor!: remove mailhog; use mailpit instead #187

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
24 changes: 0 additions & 24 deletions features/src/mailhog/README.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion features/src/mailhog/conf-mailhog.tpl
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions features/src/mailhog/devcontainer-feature.json
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions features/src/mailhog/install.sh
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion features/src/mailhog/php-mailhog.ini
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions features/src/mailhog/service-run
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion features/src/mailpit/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "mailpit",
"name": "Mailpit",
"description": "Sets up Mailpit into the Dev Environment",
"version": "1.0.2",
"version": "1.0.3",
"options": {
"enabled": {
"type": "boolean",
Expand Down
5 changes: 0 additions & 5 deletions features/src/mailpit/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ fi
if [ "${ENABLED}" = "true" ]; then
echo '(*) Installing Mailpit...'

if [ -f /usr/local/bin/mailhog ]; then
echo '(!) Mailpit cannot be installed along with MailHog.'
exit 1
fi

ARCH="$(arch)"
LATEST=$(curl -w '%{url_effective}' -I -L -s -S https://github.com/axllent/mailpit/releases/latest -o /dev/null | sed -e 's|.*/||')
if [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "aarch64" ]; then
Expand Down
2 changes: 1 addition & 1 deletion features/src/php/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "php",
"name": "PHP",
"description": "Installs PHP into the Dev Environment",
"version": "2.3.0",
"version": "2.3.1",
"containerEnv": {
"PHP_INI_DIR": "/etc/php"
},
Expand Down
1 change: 0 additions & 1 deletion features/src/php/php.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ realpath_cache_size = "800K"
realpath_cache_ttl = "86400"
disable_functions =
sendmail_path=/bin/true
;sendmail_path = "/usr/local/bin/mhsendmail --smtp-addr='sendmailhog:1025'"

[Date]
date.timezone = "UTC"
Expand Down
4 changes: 2 additions & 2 deletions templates/src/dev-env-ghcs/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"enabled": "${templateOption:vipCliEnabled}"
},
// Tools
"ghcr.io/automattic/vip-codespaces/mailhog:latest": {
"enabled": "${templateOption:mailhogEnabled}"
"ghcr.io/automattic/vip-codespaces/mailpit:latest": {
"enabled": "${templateOption:mailpitEnabled}"
},
"ghcr.io/automattic/vip-codespaces/phpmyadmin:latest": {
"enabled": "${templateOption:pmaEnabled}"
Expand Down
10 changes: 5 additions & 5 deletions templates/src/dev-env-ghcs/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"id": "dev-env-ghcs",
"name": "VIP Development Environment",
"version": "0.0.1",
"version": "0.0.2",
"options": {
"mailhogEnabled": {
"mailpitEnabled": {
"type": "boolean",
"default": false,
"description": "Enable Mailhog"
"description": "Enable Mailpit"
},
"memcachedEnabled": {
"type": "boolean",
Expand All @@ -15,8 +15,8 @@
},
"phpVersion": {
"type": "string",
"enum": ["8.0", "8.1", "8.2"],
"default": "8.0",
"enum": ["8.1", "8.2", "8.3"],
"default": "8.2",
"description": "PHP version"
},
"wordpressVersion": {
Expand Down
4 changes: 2 additions & 2 deletions templates/src/dev-env-vsc/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"enabled": "${templateOption:vipCliEnabled}"
},
// Tools
"ghcr.io/automattic/vip-codespaces/mailhog:latest": {
"enabled": "${templateOption:mailhogEnabled}"
"ghcr.io/automattic/vip-codespaces/mailpit:latest": {
"enabled": "${templateOption:mailpitEnabled}"
},
"ghcr.io/automattic/vip-codespaces/phpmyadmin:latest": {
"enabled": "${templateOption:pmaEnabled}"
Expand Down
10 changes: 5 additions & 5 deletions templates/src/dev-env-vsc/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"id": "dev-env-vsc",
"name": "VIP Development Environment (VSCode/devcontainers)",
"version": "0.0.1",
"version": "0.0.2",
"options": {
"mailhogEnabled": {
"mailpitEnabled": {
"type": "boolean",
"default": false,
"description": "Enable Mailhog"
"description": "Enable Mailpit"
},
"memcachedEnabled": {
"type": "boolean",
Expand All @@ -15,8 +15,8 @@
},
"phpVersion": {
"type": "string",
"enum": ["8.0", "8.1", "8.2"],
"default": "8.0",
"enum": ["8.1", "8.2", "8.3"],
"default": "8.3",
"description": "PHP version"
},
"wordpressVersion": {
Expand Down