From d46a89c8958e07ed7256de611b22e207a5d9c81a Mon Sep 17 00:00:00 2001 From: "kai.t" Date: Wed, 15 May 2024 07:50:16 +0700 Subject: [PATCH] update ignore git --- .env | 7 ------- .env.example | 7 ------- docker-compose.yml | 12 +++++------- pub/static/adminhtml/.gitignore | 2 ++ pub/static/frontend/.gitignore | 2 ++ 5 files changed, 9 insertions(+), 21 deletions(-) create mode 100644 pub/static/adminhtml/.gitignore create mode 100644 pub/static/frontend/.gitignore diff --git a/.env b/.env index e69c7714..c1072e27 100755 --- a/.env +++ b/.env @@ -20,10 +20,3 @@ ADMIN_PASSWORD=admin123 # SYSTEM TIMEZONE="Asia/Bangkok" CURRENCY="USD" - -# MAIL -MAIL_SERVER=smtp -MAIL_HOST=magento.kai.com -MAIL_PORT=587 -MAIL_USERNAME=magento -MAIL_PASSWORD=secret diff --git a/.env.example b/.env.example index a381e77e..67af1b95 100755 --- a/.env.example +++ b/.env.example @@ -21,10 +21,3 @@ ADMIN_PASSWORD=admin123 # SYSTEM TIMEZONE="Asia/Bangkok" CURRENCY="$" - -# MAIL -MAIL_SERVER=smtp -MAIL_HOST=magento.kai.com -MAIL_PORT=587 -MAIL_USERNAME=magento -MAIL_PASSWORD=secret diff --git a/docker-compose.yml b/docker-compose.yml index 93c0ab46..9b8bf79c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,10 +43,8 @@ services: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - smtp: - image: bytemark/smtp - environment: - RELAY_HOST: ${MAIL_HOST} - RELAY_PORT: ${MAIL_PORT} - RELAY_USERNAME: ${MAIL_USERNAME} - RELAY_PASSWORD: ${MAIL_PASSWORD} + mail: + image: axllent/mailpit:latest + ports: + - 1025:1025 + - 8025:8025 diff --git a/pub/static/adminhtml/.gitignore b/pub/static/adminhtml/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/pub/static/adminhtml/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pub/static/frontend/.gitignore b/pub/static/frontend/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/pub/static/frontend/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore