mirror of
https://github.com/Mailu/Mailu.git
synced 2024-12-12 10:45:38 +02:00
7c03878347
1441: Rsyslog logging for postfix r=mergify[bot] a=micw
## What type of PR?
enhancement
## What does this PR do?
Changes postfix logging from stdout to rsyslog:
* stdout logging still enabled
* internal test request log messages are filtered out by rsyslog
* optional logging to file via POSTFIX_LOG_FILE env variable
## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.
- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/guide.html#changelog) entry file.
2090: fix 2086 r=mergify[bot] a=nextgens
## What type of PR?
bug-fix
## What does this PR do?
Fix a bug I've introduced in ae8db08bd
### Related issue(s)
- close #2086
Co-authored-by: Michael Wyraz <michael@wyraz.de>
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
Co-authored-by: Dimitri Huisman <52963853+Diman0@users.noreply.github.com>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
37 lines
975 B
Docker
37 lines
975 B
Docker
ARG DISTRO=alpine:3.14.2
|
|
|
|
FROM $DISTRO
|
|
ARG VERSION
|
|
|
|
ENV TZ Etc/UTC
|
|
|
|
LABEL version=$VERSION
|
|
|
|
# python3 shared with most images
|
|
RUN apk add --no-cache \
|
|
python3 py3-pip git bash py3-multidict py3-yarl tzdata \
|
|
&& pip3 install --upgrade pip
|
|
|
|
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube
|
|
RUN pip3 install socrate==0.2.0
|
|
|
|
# Shared layer between dovecot and postfix
|
|
RUN pip3 install "podop>0.2.5"
|
|
|
|
# Image specific layers under this line
|
|
RUN apk add --no-cache --virtual .build-deps gcc musl-dev python3-dev
|
|
RUN pip3 install --no-binary :all: postfix-mta-sts-resolver==1.0.1
|
|
RUN apk del .build-deps gcc musl-dev python3-dev
|
|
|
|
RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-login rsyslog logrotate
|
|
|
|
COPY conf /conf
|
|
COPY start.py /start.py
|
|
|
|
EXPOSE 25/tcp 10025/tcp
|
|
VOLUME ["/queue"]
|
|
|
|
CMD /start.py
|
|
|
|
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
|
|
RUN echo $VERSION >> /version |