File tree Expand file tree Collapse file tree 29 files changed +129
-42
lines changed Expand file tree Collapse file tree 29 files changed +129
-42
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ ENV DEBUG false
9
9
ENV MAGENTO_RUN_MODE production
10
10
ENV UPDATE_UID_GID false
11
11
ENV COMPOSER_ALLOW_SUPERUSER 1
12
+ ENV ENABLE_SENDMAIL true
12
13
13
14
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mcrypt mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
14
15
@@ -28,8 +29,6 @@ RUN apt-get update \
28
29
python3 \
29
30
python3-pip \
30
31
redis-tools \
31
- sendmail \
32
- sendmail-bin \
33
32
sudo \
34
33
unzip \
35
34
vim \
@@ -66,6 +65,11 @@ RUN pip3 install --upgrade setuptools \
66
65
# Install Grunt
67
66
RUN npm install -g grunt-cli
68
67
68
+ # Install MailHog
69
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
70
+ && sudo chmod +x mhsendmail_linux_amd64 \
71
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
72
+
69
73
# Configure the gd library
70
74
RUN docker-php-ext-configure \
71
75
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
Original file line number Diff line number Diff line change @@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
42
42
43
43
# Configure Sendmail if required
44
44
if [ " $ENABLE_SENDMAIL " == " true" ]; then
45
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
46
- /etc/init.d/sendmail start
45
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
47
46
else
48
47
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
49
48
fi
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ENV DEBUG false
8
8
ENV MAGENTO_RUN_MODE production
9
9
ENV UPLOAD_MAX_FILESIZE 64M
10
10
ENV UPDATE_UID_GID false
11
+ ENV ENABLE_SENDMAIL true
11
12
12
13
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mcrypt mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
13
14
@@ -16,8 +17,6 @@ RUN apt-get update \
16
17
&& apt-get upgrade -y \
17
18
&& apt-get install -y --no-install-recommends \
18
19
apt-utils \
19
- sendmail-bin \
20
- sendmail \
21
20
sudo \
22
21
libbz2-dev \
23
22
libjpeg62-turbo-dev \
@@ -45,6 +44,11 @@ RUN apt-get update \
45
44
zip \
46
45
&& rm -rf /var/lib/apt/lists/*
47
46
47
+ # Install MailHog
48
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
49
+ && sudo chmod +x mhsendmail_linux_amd64 \
50
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
51
+
48
52
# Configure the gd library
49
53
RUN docker-php-ext-configure \
50
54
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
Original file line number Diff line number Diff line change @@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
34
34
35
35
# Configure Sendmail if required
36
36
if [ " $ENABLE_SENDMAIL " == " true" ]; then
37
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
38
- /etc/init.d/sendmail start
37
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
39
38
else
40
39
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
41
40
fi
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ ENV DEBUG false
9
9
ENV MAGENTO_RUN_MODE production
10
10
ENV UPDATE_UID_GID false
11
11
ENV COMPOSER_ALLOW_SUPERUSER 1
12
+ ENV ENABLE_SENDMAIL true
12
13
13
14
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
14
15
@@ -28,8 +29,6 @@ RUN apt-get update \
28
29
python3 \
29
30
python3-pip \
30
31
redis-tools \
31
- sendmail \
32
- sendmail-bin \
33
32
sudo \
34
33
unzip \
35
34
vim \
@@ -65,6 +64,11 @@ RUN pip3 install --upgrade setuptools \
65
64
# Install Grunt
66
65
RUN npm install -g grunt-cli
67
66
67
+ # Install MailHog
68
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
69
+ && sudo chmod +x mhsendmail_linux_amd64 \
70
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
71
+
68
72
# Configure the gd library
69
73
RUN docker-php-ext-configure \
70
74
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
Original file line number Diff line number Diff line change @@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
42
42
43
43
# Configure Sendmail if required
44
44
if [ " $ENABLE_SENDMAIL " == " true" ]; then
45
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
46
- /etc/init.d/sendmail start
45
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
47
46
else
48
47
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
49
48
fi
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ENV DEBUG false
8
8
ENV MAGENTO_RUN_MODE production
9
9
ENV UPLOAD_MAX_FILESIZE 64M
10
10
ENV UPDATE_UID_GID false
11
+ ENV ENABLE_SENDMAIL true
11
12
12
13
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
13
14
@@ -16,8 +17,6 @@ RUN apt-get update \
16
17
&& apt-get upgrade -y \
17
18
&& apt-get install -y --no-install-recommends \
18
19
apt-utils \
19
- sendmail-bin \
20
- sendmail \
21
20
sudo \
22
21
libbz2-dev \
23
22
libjpeg62-turbo-dev \
@@ -44,6 +43,11 @@ RUN apt-get update \
44
43
zip \
45
44
&& rm -rf /var/lib/apt/lists/*
46
45
46
+ # Install MailHog
47
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
48
+ && sudo chmod +x mhsendmail_linux_amd64 \
49
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
50
+
47
51
# Configure the gd library
48
52
RUN docker-php-ext-configure \
49
53
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
Original file line number Diff line number Diff line change @@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
34
34
35
35
# Configure Sendmail if required
36
36
if [ " $ENABLE_SENDMAIL " == " true" ]; then
37
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
38
- /etc/init.d/sendmail start
37
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
39
38
else
40
39
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
41
40
fi
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ ENV DEBUG false
9
9
ENV MAGENTO_RUN_MODE production
10
10
ENV UPDATE_UID_GID false
11
11
ENV COMPOSER_ALLOW_SUPERUSER 1
12
+ ENV ENABLE_SENDMAIL true
12
13
13
14
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
14
15
@@ -28,8 +29,6 @@ RUN apt-get update \
28
29
python3 \
29
30
python3-pip \
30
31
redis-tools \
31
- sendmail \
32
- sendmail-bin \
33
32
sudo \
34
33
unzip \
35
34
vim \
@@ -63,6 +62,11 @@ RUN pip3 install --upgrade setuptools \
63
62
# Install Grunt
64
63
RUN npm install -g grunt-cli
65
64
65
+ # Install MailHog
66
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
67
+ && sudo chmod +x mhsendmail_linux_amd64 \
68
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
69
+
66
70
# Configure the gd library
67
71
RUN docker-php-ext-configure \
68
72
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
Original file line number Diff line number Diff line change @@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
42
42
43
43
# Configure Sendmail if required
44
44
if [ " $ENABLE_SENDMAIL " == " true" ]; then
45
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
46
- /etc/init.d/sendmail start
45
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
47
46
else
48
47
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
49
48
fi
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ENV DEBUG false
8
8
ENV MAGENTO_RUN_MODE production
9
9
ENV UPLOAD_MAX_FILESIZE 64M
10
10
ENV UPDATE_UID_GID false
11
+ ENV ENABLE_SENDMAIL true
11
12
12
13
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
13
14
@@ -16,8 +17,6 @@ RUN apt-get update \
16
17
&& apt-get upgrade -y \
17
18
&& apt-get install -y --no-install-recommends \
18
19
apt-utils \
19
- sendmail-bin \
20
- sendmail \
21
20
sudo \
22
21
libbz2-dev \
23
22
libjpeg62-turbo-dev \
@@ -42,6 +41,11 @@ RUN apt-get update \
42
41
zip \
43
42
&& rm -rf /var/lib/apt/lists/*
44
43
44
+ # Install MailHog
45
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
46
+ && sudo chmod +x mhsendmail_linux_amd64 \
47
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
48
+
45
49
# Configure the gd library
46
50
RUN docker-php-ext-configure \
47
51
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
Original file line number Diff line number Diff line change @@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
34
34
35
35
# Configure Sendmail if required
36
36
if [ " $ENABLE_SENDMAIL " == " true" ]; then
37
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
38
- /etc/init.d/sendmail start
37
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
39
38
else
40
39
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
41
40
fi
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ ENV DEBUG false
9
9
ENV MAGENTO_RUN_MODE production
10
10
ENV UPDATE_UID_GID false
11
11
ENV COMPOSER_ALLOW_SUPERUSER 1
12
+ ENV ENABLE_SENDMAIL true
12
13
13
14
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
14
15
@@ -28,8 +29,6 @@ RUN apt-get update \
28
29
python3 \
29
30
python3-pip \
30
31
redis-tools \
31
- sendmail \
32
- sendmail-bin \
33
32
sudo \
34
33
unzip \
35
34
vim \
@@ -59,6 +58,11 @@ RUN pip3 install --upgrade setuptools \
59
58
# Install Grunt
60
59
RUN npm install -g grunt-cli
61
60
61
+ # Install MailHog
62
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
63
+ && sudo chmod +x mhsendmail_linux_amd64 \
64
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
65
+
62
66
# Configure the gd library
63
67
RUN docker-php-ext-configure \
64
68
gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
Original file line number Diff line number Diff line change @@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
42
42
43
43
# Configure Sendmail if required
44
44
if [ " $ENABLE_SENDMAIL " == " true" ]; then
45
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
46
- /etc/init.d/sendmail start
45
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
47
46
else
48
47
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
49
48
fi
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ENV DEBUG false
8
8
ENV MAGENTO_RUN_MODE production
9
9
ENV UPLOAD_MAX_FILESIZE 64M
10
10
ENV UPDATE_UID_GID false
11
+ ENV ENABLE_SENDMAIL true
11
12
12
13
ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
13
14
@@ -16,8 +17,6 @@ RUN apt-get update \
16
17
&& apt-get upgrade -y \
17
18
&& apt-get install -y --no-install-recommends \
18
19
apt-utils \
19
- sendmail-bin \
20
- sendmail \
21
20
sudo \
22
21
libbz2-dev \
23
22
libjpeg62-turbo-dev \
@@ -38,6 +37,11 @@ RUN apt-get update \
38
37
zip \
39
38
&& rm -rf /var/lib/apt/lists/*
40
39
40
+ # Install MailHog
41
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
42
+ && sudo chmod +x mhsendmail_linux_amd64 \
43
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
44
+
41
45
# Configure the gd library
42
46
RUN docker-php-ext-configure \
43
47
gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
Original file line number Diff line number Diff line change @@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
34
34
35
35
# Configure Sendmail if required
36
36
if [ " $ENABLE_SENDMAIL " == " true" ]; then
37
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
38
- /etc/init.d/sendmail start
37
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
39
38
else
40
39
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
41
40
fi
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ ENV DEBUG false
9
9
ENV MAGENTO_RUN_MODE production
10
10
ENV UPDATE_UID_GID false
11
11
ENV COMPOSER_ALLOW_SUPERUSER 1
12
+ ENV ENABLE_SENDMAIL true
12
13
13
14
{%env_php_extensions%}
14
15
@@ -29,6 +30,11 @@ RUN pip3 install --upgrade setuptools \
29
30
# Install Grunt
30
31
RUN npm install -g grunt-cli
31
32
33
+ # Install MailHog
34
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
35
+ && sudo chmod +x mhsendmail_linux_amd64 \
36
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
37
+
32
38
# Configure the gd library
33
39
{%docker-php-ext-configure%}
34
40
Original file line number Diff line number Diff line change @@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
42
42
43
43
# Configure Sendmail if required
44
44
if [ " $ENABLE_SENDMAIL " == " true" ]; then
45
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
46
- /etc/init.d/sendmail start
45
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
47
46
else
48
47
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
49
48
fi
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ENV DEBUG false
8
8
ENV MAGENTO_RUN_MODE production
9
9
ENV UPLOAD_MAX_FILESIZE 64M
10
10
ENV UPDATE_UID_GID false
11
+ ENV ENABLE_SENDMAIL true
11
12
12
13
{%env_php_extensions%}
13
14
@@ -18,6 +19,11 @@ RUN apt-get update \
18
19
{%packages%} \
19
20
&& rm -rf /var/lib/apt/lists/*
20
21
22
+ # Install MailHog
23
+ RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
24
+ && sudo chmod +x mhsendmail_linux_amd64 \
25
+ && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
26
+
21
27
# Configure the gd library
22
28
{%docker-php-ext-configure%}
23
29
Original file line number Diff line number Diff line change @@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
34
34
35
35
# Configure Sendmail if required
36
36
if [ " $ENABLE_SENDMAIL " == " true" ]; then
37
- sed -i " s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR} /zz-mail.ini
38
- /etc/init.d/sendmail start
37
+ sed -i " s/!SENDMAIL_PATH!/\" \/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\" /" ${PHP_EXT_DIR} /zz-mail.ini
39
38
else
40
39
sed -i " s/!SENDMAIL_PATH!/\" true > \/dev\/null\" /" ${PHP_EXT_DIR} /zz-mail.ini
41
40
fi
Original file line number Diff line number Diff line change @@ -33,8 +33,6 @@ class GeneratePhp extends Command
33
33
private const ARGUMENT_VERSION = 'version ' ;
34
34
private const DEFAULT_PACKAGES_PHP_FPM = [
35
35
'apt-utils ' ,
36
- 'sendmail-bin ' ,
37
- 'sendmail ' ,
38
36
'sudo '
39
37
];
40
38
private const DEFAULT_PACKAGES_PHP_CLI = [
@@ -47,8 +45,6 @@ class GeneratePhp extends Command
47
45
'python3 ' ,
48
46
'python3-pip ' ,
49
47
'redis-tools ' ,
50
- 'sendmail ' ,
51
- 'sendmail-bin ' ,
52
48
'sudo ' ,
53
49
'unzip ' ,
54
50
'vim ' ,
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ interface BuilderInterface
34
34
public const SERVICE_CRON = 'cron ' ;
35
35
public const SERVICE_TEST = 'test ' ;
36
36
public const SERVICE_HEALTHCHECK = 'healthcheck ' ;
37
+ public const SERVICE_MAILHOG = 'mailhog ' ;
37
38
38
39
public const NETWORK_MAGENTO = 'magento ' ;
39
40
public const NETWORK_MAGENTO_BUILD = 'magento-build ' ;
You can’t perform that action at this time.
0 commit comments