Skip to content

Commit 3abc525

Browse files
vitormattosvitormattos
authored
Merge pull request #6709 from LibreSign/backport/6704/stable32
[stable32] refactor: replace mailhog with mailpit
2 parents cdbd4d4 + e4afb9d commit 3abc525

10 files changed

Lines changed: 788 additions & 697 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"elevateIfNeeded": true
6161
},
6262
"8025": {
63-
"label": "mailhog",
63+
"label": "mailpit",
6464
"protocol": "http",
6565
"onAutoForward": "notify",
6666
"elevateIfNeeded": true

‎.devcontainer/docker-compose.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ services:
5151
- POSTGRES_USER=${POSTGRES_USER:-nextcloud}
5252
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-nextcloud}
5353
- MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS:-nextcloud}
54-
- MAIL_DOMAIN=${MAIL_DOMAIN:-mailhog}
54+
- MAIL_DOMAIN=${MAIL_DOMAIN:-mailpit}
5555
- MAIL_SMTPPORT=${MAIL_SMTPPORT:-1025}
56-
- MAIL_SMTPHOST=${MAIL_SMTPHOST:-mailhog}
56+
- MAIL_SMTPHOST=${MAIL_SMTPHOST:-mailpit}
5757
- VERSION_NEXTCLOUD=${VERSION_NEXTCLOUD:-master}
5858
- AUTOINSTALL=${AUTOINSTALL:-1}
5959
- XDEBUG_CONFIG
@@ -68,10 +68,10 @@ services:
6868
- ../:/var/www/html/apps-extra/libresign:ro
6969
ports:
7070
- ${HTTP_PORT:-80}:80
71-
mailhog:
72-
image: blueimp/mailhog
71+
mailpit:
72+
image: axllent/mailpit
7373
ports:
74-
- 127.0.0.1:${MAILHOG_PORT:-8025}:8025
74+
- 127.0.0.1:${MAILPIT_PORT:-8025}:8025
7575
redis:
7676
image: redis
7777
volumes:

‎.github/workflows/behat-mariadb.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
env:
7373
MYSQL_ROOT_PASSWORD: rootpassword
7474
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
75-
mailhog:
76-
image: mailhog/mailhog
75+
mailpit:
76+
image: axllent/mailpit
7777
ports:
7878
- 8025:8025/tcp
7979
- 1025:1025/tcp
@@ -132,7 +132,7 @@ jobs:
132132
env:
133133
DB_PORT: 4444
134134
run: |
135-
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
135+
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
136136
mkdir data
137137
./occ maintenance:install \
138138
--verbose \
@@ -154,7 +154,7 @@ jobs:
154154
./occ app:enable --force guests
155155
./occ config:system:set allow_local_remote_servers --value true --type boolean
156156
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
157-
./occ config:system:set mail_smtphost --value mailhog
157+
./occ config:system:set mail_smtphost --value mailpit
158158
./occ config:system:set mail_smtpport --value 1025 --type integer
159159
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
160160
./occ config:app:set dav enableDefaultContact --value false --type boolean

‎.github/workflows/behat-mysql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
env:
7777
MYSQL_ROOT_PASSWORD: rootpassword
7878
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
79-
mailhog:
80-
image: mailhog/mailhog
79+
mailpit:
80+
image: axllent/mailpit
8181
ports:
8282
- 8025:8025/tcp
8383
- 1025:1025/tcp
@@ -144,7 +144,7 @@ jobs:
144144
env:
145145
DB_PORT: 4444
146146
run: |
147-
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
147+
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
148148
mkdir data
149149
./occ maintenance:install \
150150
--verbose \
@@ -166,7 +166,7 @@ jobs:
166166
./occ app:enable --force guests
167167
./occ config:system:set allow_local_remote_servers --value true --type boolean
168168
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
169-
./occ config:system:set mail_smtphost --value mailhog
169+
./occ config:system:set mail_smtphost --value mailpit
170170
./occ config:system:set mail_smtpport --value 1025 --type integer
171171
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
172172
./occ config:app:set dav enableDefaultContact --value false --type boolean

‎.github/workflows/behat-pgsql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ jobs:
7575
POSTGRES_PASSWORD: rootpassword
7676
POSTGRES_DB: nextcloud
7777
options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
78-
mailhog:
79-
image: mailhog/mailhog
78+
mailpit:
79+
image: axllent/mailpit
8080
ports:
8181
- 8025:8025/tcp
8282
- 1025:1025/tcp
@@ -138,7 +138,7 @@ jobs:
138138
env:
139139
DB_PORT: 4444
140140
run: |
141-
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
141+
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
142142
mkdir data
143143
./occ maintenance:install \
144144
--verbose \
@@ -160,7 +160,7 @@ jobs:
160160
./occ app:enable --force guests
161161
./occ config:system:set allow_local_remote_servers --value true --type boolean
162162
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
163-
./occ config:system:set mail_smtphost --value mailhog
163+
./occ config:system:set mail_smtphost --value mailpit
164164
./occ config:system:set mail_smtpport --value 1025 --type integer
165165
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
166166
./occ config:app:set dav enableDefaultContact --value false --type boolean

‎.github/workflows/behat-sqlite.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ jobs:
6666
name: SQLite PHP ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
6767

6868
services:
69-
mailhog:
70-
image: mailhog/mailhog
69+
mailpit:
70+
image: axllent/mailpit
7171
ports:
7272
- 8025:8025/tcp
7373
- 1025:1025/tcp
@@ -129,7 +129,7 @@ jobs:
129129
env:
130130
DB_PORT: 4444
131131
run: |
132-
sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts
132+
sudo echo "127.0.0.1 mailpit" | sudo tee -a /etc/hosts
133133
mkdir data
134134
./occ maintenance:install \
135135
--verbose \
@@ -151,7 +151,7 @@ jobs:
151151
./occ app:enable --force guests
152152
./occ config:system:set allow_local_remote_servers --value true --type boolean
153153
./occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
154-
./occ config:system:set mail_smtphost --value mailhog
154+
./occ config:system:set mail_smtphost --value mailpit
155155
./occ config:system:set mail_smtpport --value 1025 --type integer
156156
./occ config:system:set ratelimit.protection.enabled --value false --type boolean
157157
./occ config:app:set dav enableDefaultContact --value false --type boolean

‎tests/integration/composer.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
"jarnaiz/behat-junit-formatter": "^1.3",
77
"php-http/guzzle7-adapter": "^1.0",
88
"php-http/message": "^1.16",
9-
"rpkamp/mailhog-behat-extension": "^1.0"
10-
},
11-
"require-dev": {
12-
"libresign/nextcloud-behat": "^1"
9+
"libresign/nextcloud-behat": "^1.4",
10+
"libresign/mailpit-behat-extension": "^0.1.1"
1311
},
1412
"config": {
1513
"allow-plugins": {
1614
"php-http/discovery": true
1715
},
1816
"platform": {
19-
"php": "8.1"
17+
"php": "8.2"
2018
}
2119
}
2220
}

0 commit comments

Comments
 (0)