diff --git a/.github/workflows/pr-mailhog-tests.yml b/.github/workflows/pr-mailhog-tests.yml index 2efe8c1..898885f 100644 --- a/.github/workflows/pr-mailhog-tests.yml +++ b/.github/workflows/pr-mailhog-tests.yml @@ -14,7 +14,7 @@ jobs: leia-test: - examples/mailhog lando-version: - - 3-dev-slim + - 3-slim os: - ubuntu-22.04 node-version: @@ -37,7 +37,7 @@ jobs: version: dev sync: false - name: Setup lando ${{ matrix.lando-version }} - uses: lando/setup-lando@v2 + uses: lando/setup-lando@v3 with: lando-version: ${{ matrix.lando-version }} config: | diff --git a/examples/mailhog/.lando.yml b/examples/mailhog/.lando.yml index 8ccb105..247acd4 100755 --- a/examples/mailhog/.lando.yml +++ b/examples/mailhog/.lando.yml @@ -4,11 +4,16 @@ services: type: mailhog hogfrom: - php + - nginx php: type: php + nginx: + type: nginx:1.25 # This is important because it lets lando know to test against the plugin in this repo # DO NOT REMOVE THIS! plugins: "@lando/mailhog": ../.. - "@lando/php": ./node_modules/@lando/php + "@lando/php": ../../node_modules/@lando/php + "@lando/nginx": ../../node_modules/@lando/nginx + diff --git a/examples/mailhog/README.md b/examples/mailhog/README.md index a487955..0b0b872 100755 --- a/examples/mailhog/README.md +++ b/examples/mailhog/README.md @@ -29,12 +29,15 @@ Run the following commands to validate things are rolling as they should. ```bash # Should have the mhsendmail binary lando ssh -s php -c "ls -lsa /usr/local/bin | grep mhsendmail" +lando ssh -s nginx -c "ls -lsa /usr/local/bin | grep mhsendmail" # Should have the MH_SENDMAIL_SMTP_ADDR set lando ssh -s php -c "env | grep MH_SENDMAIL_SMTP_ADDR=sendmailhog:1025" +lando ssh -s nginx -c "env | grep MH_SENDMAIL_SMTP_ADDR=sendmailhog:1025" # Should be serving the admin interface on port 80 lando ssh -s php -c "curl mailhog | grep MailHog" +lando ssh -s nginx -c "curl mailhog | grep MailHog" # Should have mailhog set as the meUser lando ssh -s mailhog -c "id | grep mailhog" diff --git a/examples/mailhog/index.html b/examples/mailhog/index.html new file mode 100755 index 0000000..dd3354c --- /dev/null +++ b/examples/mailhog/index.html @@ -0,0 +1 @@ +HELLO THERE! diff --git a/package-lock.json b/package-lock.json index e53c3a3..85afd95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,8 @@ "devDependencies": { "@babel/eslint-parser": "^7.16.0", "@lando/leia": "^1.0.0-beta.3", + "@lando/nginx": "^1.1.0", + "@lando/php": "^1.3.0", "@lando/vitepress-theme-default-plus": "^1.0.0-beta.41", "chai": "^4.3.4", "command-line-test": "^1.0.10", @@ -1311,6 +1313,106 @@ "node": ">=8" } }, + "node_modules/@lando/nginx": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@lando/nginx/-/nginx-1.1.0.tgz", + "integrity": "sha512-ptuYaA5bBhcsC7082AtOXfBjM1tZ7pIrQEZXjjR1AYJlQ6CSwBci9tVz6dzcIs6AJy1gfY4ytSgLVV96QQHSlQ==", + "bundleDependencies": [ + "lodash" + ], + "dev": true, + "dependencies": { + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@lando/nginx/node_modules/lodash": { + "version": "4.17.21", + "dev": true, + "inBundle": true, + "license": "MIT" + }, + "node_modules/@lando/php": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.3.0.tgz", + "integrity": "sha512-pWZ1fWHWgCURG8bqePby4W2aq0V/zX0Lj2TO0dldMJtsQy8eP9Em/yfScX9BCLbjFgORichDXS2/907njTJ8QA==", + "bundleDependencies": [ + "@lando/nginx", + "lodash", + "semver" + ], + "dev": true, + "dependencies": { + "@lando/nginx": "0.11.0", + "lodash": "^4.17.21", + "semver": "^7.3.7" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@lando/php/node_modules/@lando/nginx": { + "version": "0.11.0", + "bundleDependencies": [ + "lodash" + ], + "dev": true, + "inBundle": true, + "license": "GPL-3.0", + "dependencies": { + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@lando/php/node_modules/@lando/nginx/node_modules/lodash": { + "version": "4.17.21", + "dev": true, + "inBundle": true, + "license": "MIT" + }, + "node_modules/@lando/php/node_modules/lodash": { + "version": "4.17.21", + "dev": true, + "inBundle": true, + "license": "MIT" + }, + "node_modules/@lando/php/node_modules/semver": { + "version": "7.5.4", + "dev": true, + "inBundle": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@lando/php/node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "inBundle": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@lando/php/node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "inBundle": true, + "license": "ISC" + }, "node_modules/@lando/vitepress-theme-default-plus": { "version": "1.0.0-beta.41", "resolved": "https://registry.npmjs.org/@lando/vitepress-theme-default-plus/-/vitepress-theme-default-plus-1.0.0-beta.41.tgz", diff --git a/package.json b/package.json index 1b25a8a..0a1b01a 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,8 @@ "devDependencies": { "@babel/eslint-parser": "^7.16.0", "@lando/leia": "^1.0.0-beta.3", + "@lando/nginx": "^1.1.0", + "@lando/php": "^1.3.0", "@lando/vitepress-theme-default-plus": "^1.0.0-beta.41", "chai": "^4.3.4", "command-line-test": "^1.0.10",