Skip to content

Commit ef40e46

Browse files
Jnoack331Jnoack331
authored
Merge pull request #21 from solutionDrive/add-mailhog-to-all-containers
added mailhog to all docker-composer-files
2 parents 413faa5 + 553df89 commit ef40e46

File tree

6 files changed

+80
-2
lines changed

6 files changed

+80
-2
lines changed

‎bin/sdTest.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function echo_configuration {
6464
echo "PHP 7.0: ${SHOPWARE_VERSION}870"
6565
echo "PHP 5.6: ${SHOPWARE_VERSION}856"
6666
echo "MySQL: ${SHOPWARE_VERSION}331"
67+
echo "Mailhog: 80${SHOPWARE_VERSION}"
6768
echo ""
6869
echo "PROJECT_DIR: ${PROJECT_DIR}"
6970
echo "PROJECT_NAME: ${PROJECT_NAME}"

‎docker-compose52.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ services:
4848
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
4949
links:
5050
- mysql
51+
- mailhog
5152
depends_on:
5253
- mysql
54+
- mailhog
5355

5456
shopware52_php72:
5557
image: solutiondrive/docker-shopware-container:shopware5.2.27-php7.2
@@ -64,8 +66,10 @@ services:
6466
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
6567
links:
6668
- mysql
69+
- mailhog
6770
depends_on:
6871
- mysql
72+
- mailhog
6973

7074
shopware52_php71:
7175
image: solutiondrive/docker-shopware-container:shopware5.2.27-php7.1
@@ -80,8 +84,10 @@ services:
8084
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
8185
links:
8286
- mysql
87+
- mailhog
8388
depends_on:
8489
- mysql
90+
- mailhog
8591

8692
shopware52_php70:
8793
image: solutiondrive/docker-shopware-container:shopware5.2.27-php7.0
@@ -96,8 +102,10 @@ services:
96102
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
97103
links:
98104
- mysql
105+
- mailhog
99106
depends_on:
100107
- mysql
108+
- mailhog
101109

102110
shopware52_php56:
103111
image: solutiondrive/docker-shopware-container:shopware5.2.27-php5.6
@@ -112,8 +120,10 @@ services:
112120
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
113121
links:
114122
- mysql
123+
- mailhog
115124
depends_on:
116125
- mysql
126+
- mailhog
117127

118128
mysql:
119129
image: mysql:5.7.20
@@ -124,6 +134,11 @@ services:
124134
ports:
125135
- "52331:3306"
126136

137+
mailhog:
138+
image: mailhog/mailhog:v1.0.0
139+
ports:
140+
- "8052:8025"
141+
127142
volumes:
128143
shopware52_php73:
129144
shopware52_php72:

‎docker-compose53.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,13 @@ services:
4646
- ${PROJECT_DIR}:/opt/host:delegated
4747
- ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
4848
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
49+
- ./php/msmtprc:/etc/msmtprc
4950
links:
5051
- mysql
52+
- mailhog
5153
depends_on:
5254
- mysql
55+
- mailhog
5356

5457
shopware53_php72:
5558
image: solutiondrive/docker-shopware-container:shopware5.3.7-php7.2
@@ -62,10 +65,13 @@ services:
6265
- ${PROJECT_DIR}:/opt/host:delegated
6366
- ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
6467
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
68+
- ./php/msmtprc:/etc/msmtprc
6569
links:
6670
- mysql
71+
- mailhog
6772
depends_on:
6873
- mysql
74+
- mailhog
6975

7076
shopware53_php71:
7177
image: solutiondrive/docker-shopware-container:shopware5.3.7-php7.1
@@ -78,10 +84,13 @@ services:
7884
- ${PROJECT_DIR}:/opt/host:delegated
7985
- ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
8086
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
87+
- ./php/msmtprc:/etc/msmtprc
8188
links:
8289
- mysql
90+
- mailhog
8391
depends_on:
8492
- mysql
93+
- mailhog
8594

8695
shopware53_php70:
8796
image: solutiondrive/docker-shopware-container:shopware5.3.7-php7.0
@@ -94,10 +103,13 @@ services:
94103
- ${PROJECT_DIR}:/opt/host:delegated
95104
- ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
96105
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
106+
- ./php/msmtprc:/etc/msmtprc
97107
links:
98108
- mysql
109+
- mailhog
99110
depends_on:
100111
- mysql
112+
- mailhog
101113

102114
shopware53_php56:
103115
image: solutiondrive/docker-shopware-container:shopware5.3.7-php5.6
@@ -110,10 +122,13 @@ services:
110122
- ${PROJECT_DIR}:/opt/host:delegated
111123
- ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
112124
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
125+
- ./php/msmtprc:/etc/msmtprc
113126
links:
114127
- mysql
128+
- mailhog
115129
depends_on:
116130
- mysql
131+
- mailhog
117132

118133
mysql:
119134
image: mysql:5.7.20
@@ -124,6 +139,11 @@ services:
124139
ports:
125140
- "53331:3306"
126141

142+
mailhog:
143+
image: mailhog/mailhog:v1.0.0
144+
ports:
145+
- "8053:8025"
146+
127147
volumes:
128148
shopware53_php73:
129149
shopware53_php72:

‎docker-compose54.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ services:
4848
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
4949
links:
5050
- mysql
51+
- mailhog
5152
depends_on:
52-
- mysql
53+
- mysql
54+
- mailhog
5355

5456
shopware54_php72:
5557
image: solutiondrive/docker-shopware-container:shopware5.4.6-php7.2
@@ -64,8 +66,10 @@ services:
6466
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
6567
links:
6668
- mysql
69+
- mailhog
6770
depends_on:
6871
- mysql
72+
- mailhog
6973

7074
shopware54_php71:
7175
image: solutiondrive/docker-shopware-container:shopware5.4.6-php7.1
@@ -80,8 +84,10 @@ services:
8084
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
8185
links:
8286
- mysql
87+
- mailhog
8388
depends_on:
8489
- mysql
90+
- mailhog
8591

8692
shopware54_php70:
8793
image: solutiondrive/docker-shopware-container:shopware5.4.6-php7.0
@@ -96,8 +102,10 @@ services:
96102
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
97103
links:
98104
- mysql
105+
- mailhog
99106
depends_on:
100107
- mysql
108+
- mailhog
101109

102110
shopware54_php56:
103111
image: solutiondrive/docker-shopware-container:shopware5.4.6-php5.6
@@ -112,8 +120,10 @@ services:
112120
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
113121
links:
114122
- mysql
123+
- mailhog
115124
depends_on:
116-
- mysql
125+
- mysql
126+
- mailhog
117127

118128
mysql:
119129
image: mysql:5.7.20
@@ -124,6 +134,11 @@ services:
124134
ports:
125135
- "54331:3306"
126136

137+
mailhog:
138+
image: mailhog/mailhog:v1.0.0
139+
ports:
140+
- "8054:8025"
141+
127142
volumes:
128143
shopware54_php73:
129144
shopware54_php72:

‎docker-compose55.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ services:
4343
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
4444
links:
4545
- mysql
46+
- mailhog
4647
depends_on:
4748
- mysql
49+
- mailhog
4850

4951
shopware55_php71:
5052
image: solutiondrive/docker-shopware-container:shopware5.5.2-php7.1
@@ -59,8 +61,10 @@ services:
5961
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
6062
links:
6163
- mysql
64+
- mailhog
6265
depends_on:
6366
- mysql
67+
- mailhog
6468

6569
shopware55_php70:
6670
image: solutiondrive/docker-shopware-container:shopware5.5.2-php7.0
@@ -75,8 +79,10 @@ services:
7579
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
7680
links:
7781
- mysql
82+
- mailhog
7883
depends_on:
7984
- mysql
85+
- mailhog
8086

8187
shopware55_php56:
8288
image: solutiondrive/docker-shopware-container:shopware5.5.2-php5.6
@@ -91,8 +97,10 @@ services:
9197
- ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
9298
links:
9399
- mysql
100+
- mailhog
94101
depends_on:
95102
- mysql
103+
- mailhog
96104

97105
mysql:
98106
image: mysql:5.7.20
@@ -103,6 +111,11 @@ services:
103111
ports:
104112
- "55331:3306"
105113

114+
mailhog:
115+
image: mailhog/mailhog:v1.0.0
116+
ports:
117+
- "8055:8025"
118+
106119
volumes:
107120
shopware55_php72:
108121
shopware55_php71:

‎php/msmtprc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Set default values for all following accounts.
2+
defaults
3+
auth off
4+
tls off
5+
syslog on
6+
7+
account mailhog
8+
host mailhog
9+
port 1025
10+
from root@php
11+
12+
# Set a default account
13+
account default : mailhog
14+
aliases /etc/aliases

0 commit comments

Comments
 (0)