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
3 changes: 0 additions & 3 deletions files/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@ trim_trailing_whitespace = false
[*.{yml,yaml}]
indent_size = 2

[docker-compose.yml]
indent_size = 4

[composer.json]
indent_size = 2
2 changes: 1 addition & 1 deletion files/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=mail
MAIL_PORT=25
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
Expand Down
2 changes: 1 addition & 1 deletion files/bin/dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -eu
cd $(dirname "$0")/../

if [ ! -d vendor/ ] || [ ! -f vendor/bin/dev ]; then
docker-compose run -u $(id -u):$(id -g) --no-deps app composer install
docker compose run --rm -u $(id -u):$(id -g) --no-deps app composer install
fi

if [ -f vendor/bin/dev ]; then
Expand Down
9 changes: 1 addition & 8 deletions files/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.1'

networks:
default:
driver: bridge
Expand Down Expand Up @@ -35,9 +33,4 @@ services:

mail:
hostname: mail.$APP_DOMAIN
image: mailhog/mailhog:latest
user: root
environment:
MH_API_BIND_ADDR: 0.0.0.0:80
MH_UI_BIND_ADDR: 0.0.0.0:80
MH_SMTP_BIND_ADDR: 0.0.0.0:25
image: axllent/mailpit:latest