remove of some inconsistency in the docker compose examples (#63)

Co-authored-by: Sven Förster <acc_gitlab@svfo.de>
This commit is contained in:
Perlenjaeger 2025-01-20 18:27:27 +01:00 committed by GitHub
parent b28ae804bf
commit 919fe857ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 43 additions and 23 deletions

View File

@ -9,16 +9,17 @@ services:
ports: ports:
- "80:80" - "80:80"
environment: environment:
- "REPORT_DB_HOST=db" - "REPORT_DB_HOST=${DB_HOST:-db}"
- "REPORT_DB_PORT=3306" - "REPORT_DB_TYPE=${DB_TYPE:-mysql}"
- "REPORT_DB_NAME=dmarc_report" - "REPORT_DB_PORT=${DB_PORT:-3306}"
- "REPORT_DB_USER=dmarc_report" - "REPORT_DB_NAME=${DB_NAME:-dmarc_report}"
- "REPORT_DB_PASS=${DMARC_DB_PASSWORD}" - "REPORT_DB_USER=${DB_USER:-dmarc_report}"
- "PARSER_IMAP_SERVER=mail" - "REPORT_DB_PASS=${DB_PASSWORD}"
- "PARSER_IMAP_PORT=143" - "PARSER_IMAP_SERVER=${IMAP_SERVER}"
- "PARSER_IMAP_USER=${DMARC_EMAIL}" - "PARSER_IMAP_PORT=${IMAP_PORT:-993}"
- "PARSER_IMAP_PASS=${DMARC_PASSWORD}" - "PARSER_IMAP_USER=${IMAP_USER}"
- "PARSER_IMAP_READ_FOLDER=Inbox" - "PARSER_IMAP_PASS=${IMAP_PASSWORD}"
- "PARSER_IMAP_READ_FOLDER=${IMAP_READ_FOLDER:-Inbox}"
- "PARSER_IMAP_MOVE_FOLDER=${IMAP_MOVE_FOLDER:-processed}" - "PARSER_IMAP_MOVE_FOLDER=${IMAP_MOVE_FOLDER:-processed}"
- "PARSER_IMAP_MOVE_FOLDER_ERR=${IMAP_MOVE_FOLDER_ERR:-error}" - "PARSER_IMAP_MOVE_FOLDER_ERR=${IMAP_MOVE_FOLDER_ERR:-error}"

View File

@ -9,16 +9,17 @@ services:
ports: ports:
- "80:80" - "80:80"
environment: environment:
- "REPORT_DB_TYPE=pgsql" - "REPORT_DB_HOST=${DB_HOST:-db}"
- "REPORT_DB_PORT=5432" - "REPORT_DB_TYPE=${DB_TYPE:-mysql}"
- "REPORT_DB_NAME=dmarc_report" - "REPORT_DB_PORT=${DB_PORT:-3306}"
- "REPORT_DB_USER=dmarc_report" - "REPORT_DB_NAME=${DB_NAME:-dmarc_report}"
- "REPORT_DB_PASS=${DMARC_DB_PASSWORD}" - "REPORT_DB_USER=${DB_USER:-dmarc_report}"
- "REPORT_DB_PASS=${DB_PASSWORD}"
- "PARSER_IMAP_SERVER=${IMAP_SERVER}" - "PARSER_IMAP_SERVER=${IMAP_SERVER}"
- "PARSER_IMAP_PORT=${IMAP_PORT:-993}" - "PARSER_IMAP_PORT=${IMAP_PORT:-993}"
- "PARSER_IMAP_USER=${DMARC_EMAIL}" - "PARSER_IMAP_USER=${IMAP_USER}"
- "PARSER_IMAP_PASS=${DMARC_PASSWORD}" - "PARSER_IMAP_PASS=${IMAP_PASSWORD}"
- "PARSER_IMAP_READ_FOLDER=Inbox" - "PARSER_IMAP_READ_FOLDER=${IMAP_READ_FOLDER:-Inbox}"
- "PARSER_IMAP_MOVE_FOLDER=${IMAP_MOVE_FOLDER:-processed}" - "PARSER_IMAP_MOVE_FOLDER=${IMAP_MOVE_FOLDER:-processed}"
- "PARSER_IMAP_MOVE_FOLDER_ERR=${IMAP_MOVE_FOLDER_ERR:-error}" - "PARSER_IMAP_MOVE_FOLDER_ERR=${IMAP_MOVE_FOLDER_ERR:-error}"

View File

@ -1,21 +1,39 @@
# databse host address
DB_HOST=
# the database type mysql or pgsql
DB_TYPE=
# the datbase port (mysql 3306) (pqsql 5432)
DB_PORT=
# the databse name
DB_NAME=
# the databse name
DB_USER=
# mysql root password. Irrelevant if you are using postgres # mysql root password. Irrelevant if you are using postgres
ROOT_DB_PASSWORD= ROOT_DB_PASSWORD=
# database password for the dmarc user # database password for the database user
DMARC_DB_PASSWORD= DB_PASSWORD=
# the email address receiving the DMARC reports # the email address receiving the DMARC reports
DMARC_EMAIL= IMAP_USER=
# the password for the email address receiving the DMARC reports # the password for the email address receiving the DMARC reports
DMARC_PASSWORD= IMAP_PASSWORD=
# the server the email address is hosted on # the server the email address is hosted on
IMAP_SERVER= IMAP_SERVER=
# optional: default is 993 # optional: default is 993 ( or 143)
IMAP_PORT= IMAP_PORT=
# optional: default is "Inbox"
IMAP_READ_FOLDER
# optional: default is "processed" # optional: default is "processed"
IMAP_MOVE_FOLDER= IMAP_MOVE_FOLDER=