diff --git a/Dockerfile b/Dockerfile index f4f7bdd..35c6379 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo # courier and pythonfilter install + activate + cleanup RUN echo '=mail-filter/courier-pythonfilter-3.0.2-r1' > /etc/portage/package.accept_keywords && \ - emerge mail-mta/courier mail-filter/courier-pythonfilter dev-python/pyspf dev-python/pydns && \ + emerge mail-mta/courier mail-filter/courier-pythonfilter dev-python/pyspf && \ ln -s /usr/bin/pythonfilter /usr/libexec/filters && \ filterctl start pythonfilter && \ rm -rf /var/db/repos/gentoo diff --git a/README.md b/README.md index f77cd6a..1d4893a 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,10 @@ Docker image providing full [Courier MTA](http://www.courier-mta.org/) suite (not just IMAP) # Usage -1. `git clone https://github.com/tuxmainy/docker-courier.git` -2. `cp env.example .env` -3. edit .env -4. make sure volume directories are present -5. `docker-compose up -d` +1. `cp env.example .env` +2. edit .env +3. make sure volume directories are present +4. `docker-compose up -d` # add users 1. `echo -n 'mypassword' |openssl sha256 -binary |base64` diff --git a/docker-compose.yml b/docker-compose.yml index 780d495..18d3962 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,32 +1,38 @@ version: "3.7" services: - server: - build: - context: . - network_mode: bridge - ports: - - "138.201.55.55:25:25" - - "138.201.55.55:143:143" - - "138.201.55.55:993:993" - - "2a01:4f8:172:101f::2:25:25" - - "2a01:4f8:172:101f::2:143:143" - - "2a01:4f8:172:101f::2:993:993" - volumes: - - conf:/etc/courier - - mail:/mail - - /dev/log:/dev/log - hostname: devloop.de - restart: always -volumes: - conf: - driver_opts: - type: "none" - o: "bind" - device: "${DATA_BASE}/conf" - mail: - driver_opts: - type: "none" - o: "bind" - device: "${DATA_BASE}/mail" + server: + build: + context: . + container_name: mail.devloop.de + networks: + - internal_mail + ports: + - "138.201.55.55:25:25" + - "138.201.55.55:143:143" + - "138.201.55.55:993:993" + - "2a01:4f8:172:101f::2:25:25" + - "2a01:4f8:172:101f::2:143:143" + - "2a01:4f8:172:101f::2:993:993" + volumes: + - conf:/conf + - mail:/mail + - /dev/log:/dev/log + hostname: devloop.de + restart: always +networks: + internal_mail: + name: internal_mail + +volumes: + conf: + driver_opts: + type: "none" + o: "bind" + device: "${DATA}/conf" + mail: + driver_opts: + type: "none" + o: "bind" + device: "${DATA}/mail" diff --git a/env.example b/env.example index bab7066..14341a0 100644 --- a/env.example +++ b/env.example @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=courier -DATA_BASE=/path/to/my/basedir/containing/maildirandconf +DATA=/path/to/my/basedir/containing/maildirandconf