Skip to content

Commit ffe7b92

Browse files
committed
[docker] Fix variables to align with generic emails parameters
1 parent 24ed3ed commit ffe7b92

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

.env.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ SMTP_PORT=587
1616
SMTP_USERNAME=ChangeMe@domain.com
1717
SMTP_PASSWORD=ChangeMe
1818
SMTP_AUTH=true
19-
SMTP_SSL_ENABLE=false
20-
SMTP_STARTTLS_ENABLE=true
19+
SMTP_SSL_ENABLE=true
20+
SMTP_STARTTLS_ENABLE=false
2121
IMAP_HOST=imap.changeme.com
2222
IMAP_PORT=993
2323
IMAP_USERNAME=ChangeMe@domain.com

docker-compose.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -142,24 +142,24 @@ services:
142142
# ELASTICSEARCH
143143
- ENGINE_URL=http://elasticsearch:9200
144144
# SPRING MAIL Configurations
145-
- SPRING_MAIL_HOST=${SPRING_MAIL_HOST}
146-
- SPRING_MAIL_PORT=${SPRING_MAIL_PORT}
147-
- SPRING_MAIL_USERNAME=${SPRING_MAIL_USERNAME}
148-
- SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD}
149-
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH}
150-
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_SSL_ENABLE=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_SSL_ENABLE}
145+
- SPRING_MAIL_HOST=${SMTP_HOST}
146+
- SPRING_MAIL_PORT=${SMTP_PORT}
147+
- SPRING_MAIL_USERNAME=${SMTP_USERNAME}
148+
- SPRING_MAIL_PASSWORD=${SMTP_PASSWORD}
149+
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${SMTP_AUTH}
150+
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_SSL_ENABLE=${SMTP_SSL_ENABLE}
151151
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_SSL_TRUST=*
152-
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE}
152+
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${SMTP_STARTTLS_ENABLE}
153153
# IMAP Configurations
154154
- OPENAEV_MAIL_IMAP_ENABLED=${OPENAEV_MAIL_IMAP_ENABLED}
155-
- OPENAEV_MAIL_IMAP_HOST=${OPENAEV_MAIL_IMAP_HOST}
156-
- OPENAEV_MAIL_IMAP_PORT=${OPENAEV_MAIL_IMAP_PORT}
157-
- OPENAEV_MAIL_IMAP_USERNAME=${SPRING_MAIL_USERNAME}
158-
- OPENAEV_MAIL_IMAP_PASSWORD=${SPRING_MAIL_PASSWORD}
159-
- OPENAEV_MAIL_IMAP_AUTH=${OPENAEV_MAIL_IMAP_AUTH}
160-
- OPENAEV_MAIL_IMAP_SSL_ENABLE=${OPENAEV_MAIL_IMAP_SSL_ENABLE}
155+
- OPENAEV_MAIL_IMAP_HOST=${IMAP_HOST}
156+
- OPENAEV_MAIL_IMAP_PORT=${IMAP_PORT}
157+
- OPENAEV_MAIL_IMAP_USERNAME=${IMAP_USERNAME}
158+
- OPENAEV_MAIL_IMAP_PASSWORD=${IMAP_PASSWORD}
159+
- OPENAEV_MAIL_IMAP_AUTH=${IMAP_AUTH}
160+
- OPENAEV_MAIL_IMAP_SSL_ENABLE=${IMAP_SSL_ENABLE}
161161
- OPENAEV_MAIL_IMAP_SSL_TRUST=*
162-
- OPENAEV_MAIL_IMAP_STARTTLS_ENABLE=${OPENAEV_MAIL_IMAP_STARTTLS_ENABLE}
162+
- OPENAEV_MAIL_IMAP_STARTTLS_ENABLE=${IMAP_STARTTLS_ENABLE}
163163
ports:
164164
- "${OPENAEV_PORT}:8080"
165165
depends_on:

0 commit comments

Comments
 (0)