Skip to content
Merged
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"elevateIfNeeded": true
},
"8025": {
"label": "mailhog",
"label": "mailpit",
"protocol": "http",
"onAutoForward": "notify",
"elevateIfNeeded": true
Expand Down
10 changes: 5 additions & 5 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ services:
- POSTGRES_USER=${POSTGRES_USER:-nextcloud}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-nextcloud}
- MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS:-nextcloud}
- MAIL_DOMAIN=${MAIL_DOMAIN:-mailhog}
- MAIL_DOMAIN=${MAIL_DOMAIN:-mailpit}
- MAIL_SMTPPORT=${MAIL_SMTPPORT:-1025}
- MAIL_SMTPHOST=${MAIL_SMTPHOST:-mailhog}
- MAIL_SMTPHOST=${MAIL_SMTPHOST:-mailpit}
- VERSION_NEXTCLOUD=${VERSION_NEXTCLOUD:-master}
- AUTOINSTALL=${AUTOINSTALL:-1}
- XDEBUG_CONFIG
Expand All @@ -68,10 +68,10 @@ services:
- ../:/var/www/html/apps-extra/libresign:ro
ports:
- ${HTTP_PORT:-80}:80
mailhog:
image: blueimp/mailhog
mailpit:
image: axllent/mailpit
ports:
- 127.0.0.1:${MAILHOG_PORT:-8025}:8025
- 127.0.0.1:${MAILPIT_PORT:-8025}:8025
redis:
image: redis
volumes:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/behat-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ jobs:
env:
MYSQL_ROOT_PASSWORD: rootpassword
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
mailhog:
image: mailhog/mailhog
mailpit:
image: axllent/mailpit
ports:
- 8025:8025/tcp
- 1025:1025/tcp
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
env:
DB_PORT: 4444
run: |
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
mkdir data
./occ maintenance:install \
--verbose \
Expand All @@ -154,7 +154,7 @@ jobs:
./occ app:enable --force guests
./occ config:system:set allow_local_remote_servers --value true --type boolean
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
./occ config:system:set mail_smtphost --value mailhog
./occ config:system:set mail_smtphost --value mailpit
./occ config:system:set mail_smtpport --value 1025 --type integer
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
./occ config:app:set dav enableDefaultContact --value false --type boolean
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/behat-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ jobs:
env:
MYSQL_ROOT_PASSWORD: rootpassword
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
mailhog:
image: mailhog/mailhog
mailpit:
image: axllent/mailpit
ports:
- 8025:8025/tcp
- 1025:1025/tcp
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
env:
DB_PORT: 4444
run: |
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
mkdir data
./occ maintenance:install \
--verbose \
Expand All @@ -166,7 +166,7 @@ jobs:
./occ app:enable --force guests
./occ config:system:set allow_local_remote_servers --value true --type boolean
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
./occ config:system:set mail_smtphost --value mailhog
./occ config:system:set mail_smtphost --value mailpit
./occ config:system:set mail_smtpport --value 1025 --type integer
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
./occ config:app:set dav enableDefaultContact --value false --type boolean
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/behat-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jobs:
POSTGRES_PASSWORD: rootpassword
POSTGRES_DB: nextcloud
options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
mailhog:
image: mailhog/mailhog
mailpit:
image: axllent/mailpit
ports:
- 8025:8025/tcp
- 1025:1025/tcp
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
env:
DB_PORT: 4444
run: |
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
mkdir data
./occ maintenance:install \
--verbose \
Expand All @@ -160,7 +160,7 @@ jobs:
./occ app:enable --force guests
./occ config:system:set allow_local_remote_servers --value true --type boolean
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
./occ config:system:set mail_smtphost --value mailhog
./occ config:system:set mail_smtphost --value mailpit
./occ config:system:set mail_smtpport --value 1025 --type integer
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
./occ config:app:set dav enableDefaultContact --value false --type boolean
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/behat-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ jobs:
name: SQLite PHP ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}

services:
mailhog:
image: mailhog/mailhog
mailpit:
image: axllent/mailpit
ports:
- 8025:8025/tcp
- 1025:1025/tcp
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
env:
DB_PORT: 4444
run: |
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
mkdir data
./occ maintenance:install \
--verbose \
Expand All @@ -151,7 +151,7 @@ jobs:
./occ app:enable --force guests
./occ config:system:set allow_local_remote_servers --value true --type boolean
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
./occ config:system:set mail_smtphost --value mailhog
./occ config:system:set mail_smtphost --value mailpit
./occ config:system:set mail_smtpport --value 1025 --type integer
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
./occ config:app:set dav enableDefaultContact --value false --type boolean
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"jarnaiz/behat-junit-formatter": "^1.3",
"php-http/guzzle7-adapter": "^1.1",
"php-http/message": "^1.16",
"rpkamp/mailhog-behat-extension": "^1.3",
"libresign/nextcloud-behat": "^1.4"
"libresign/nextcloud-behat": "^1.4",
"libresign/mailpit-behat-extension": "^0.1.1"
},
"config": {
"allow-plugins": {
Expand Down
Loading
Loading