Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion compose/2.4.6/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
services:
php:
image: mappia/magento-php:devcontainer8.2
build:
context: ../..
dockerfile: magento2-devcontainer/docker/php/Dockerfile
args:
BASE_IMAGE: mappia/magento-php:devcontainer8.2
environment:
- PHP_IDE_CONFIG=serverName=magento
- CONFIG__DEFAULT__CATALOG__SEARCH__OPENSEARCH_SERVER_HOSTNAME=opensearch
Expand Down Expand Up @@ -92,6 +96,14 @@ services:
- magento
command: redis-server --appendonly yes

mailpit:
image: axllent/mailpit:v1.29.0
ports:
- "8025:8025"
- "1025:1025"
networks:
- magento

volumes:
db_data:
opensearch_data:
Expand Down
14 changes: 13 additions & 1 deletion compose/2.4.7/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
services:
php:
image: mappia/magento-php:devcontainer8.3
build:
context: ../..
dockerfile: magento2-devcontainer/docker/php/Dockerfile
args:
BASE_IMAGE: mappia/magento-php:devcontainer8.3
environment:
- PHP_IDE_CONFIG=serverName=magento
- CONFIG__DEFAULT__CATALOG__SEARCH__OPENSEARCH_SERVER_HOSTNAME=opensearch
Expand Down Expand Up @@ -92,6 +96,14 @@ services:
- magento
command: redis-server --appendonly yes

mailpit:
image: axllent/mailpit:v1.29.0
ports:
- "8025:8025"
- "1025:1025"
networks:
- magento

volumes:
db_data:
opensearch_data:
Expand Down
14 changes: 13 additions & 1 deletion compose/2.4.8/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
services:
php:
image: mappia/magento-php:devcontainer8.4
build:
context: ../..
dockerfile: magento2-devcontainer/docker/php/Dockerfile
args:
BASE_IMAGE: mappia/magento-php:devcontainer8.4
environment:
- PHP_IDE_CONFIG=serverName=magento
- CONFIG__DEFAULT__CATALOG__SEARCH__OPENSEARCH_SERVER_HOSTNAME=opensearch
Expand Down Expand Up @@ -92,6 +96,14 @@ services:
- magento
command: valkey-server --appendonly yes

mailpit:
image: axllent/mailpit:v1.29.0
ports:
- "8025:8025"
- "1025:1025"
networks:
- magento

volumes:
db_data:
opensearch_data:
Expand Down
14 changes: 13 additions & 1 deletion compose/2.4.9/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
services:
php:
image: mappia/magento-php:devcontainer8.4
build:
context: ../..
dockerfile: magento2-devcontainer/docker/php/Dockerfile
args:
BASE_IMAGE: mappia/magento-php:devcontainer8.4
environment:
- PHP_IDE_CONFIG=serverName=magento
- CONFIG__DEFAULT__CATALOG__SEARCH__OPENSEARCH_SERVER_HOSTNAME=opensearch
Expand Down Expand Up @@ -92,6 +96,14 @@ services:
- magento
command: valkey-server --appendonly yes

mailpit:
image: axllent/mailpit:v1.29.0
ports:
- "8025:8025"
- "1025:1025"
networks:
- magento

volumes:
db_data:
opensearch_data:
Expand Down
10 changes: 9 additions & 1 deletion devcontainer.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
3306,
9200,
5672,
6379
6379,
8025,
1025
],
"initializeCommand": "[ -f .devcontainer/magento2-devcontainer/.gitignore ] || (git submodule update --init --recursive)",
"portsAttributes": {
Expand All @@ -31,6 +33,12 @@
},
"6379": {
"label": "Redis/Valkey"
},
"8025": {
"label": "Mailpit UI"
},
"1025": {
"label": "Mailpit SMTP"
}
},
"customizations": {
Expand Down
1 change: 1 addition & 0 deletions docker-compose.shared.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ services:
php:
volumes:
- ../:/workspace:cached
- ./magento2-devcontainer/mailpit/mailpit.ini.sample:/usr/local/etc/php/conf.d/mailpit.ini:ro
working_dir: /workspace

nginx:
Expand Down
9 changes: 9 additions & 0 deletions docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ARG BASE_IMAGE
FROM ${BASE_IMAGE}

ARG TARGETARCH=amd64

RUN set -x && set -o pipefail \
&& curl -fsSL "https://github.com/axllent/mailpit/releases/download/v1.29.0/mailpit-linux-${TARGETARCH}.tar.gz" -o /tmp/mailpit.tar.gz \
&& tar -zx -C /usr/local/bin -f /tmp/mailpit.tar.gz mailpit \
&& rm /tmp/mailpit.tar.gz
10 changes: 10 additions & 0 deletions mailpit/mailpit.ini.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
; https://php.net/sendmail-path
sendmail_path="/usr/local/bin/mailpit sendmail -t --smtp-addr mailpit:1025"

; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
mail.add_x_header = On

; Use mixed LF and CRLF line separators to keep compatibility with some
; RFC 2822 non conformant MTA.
mail.mixed_lf_and_crlf = Off