diff options
| author |   Ihor Antonov <ngortheone@users.noreply.github.com> | 2019-10-23 09:28:48 -0400 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-10-23 09:28:48 -0400 |
| commit | 265045fa1625daab57d5406f5873404cbdeded8a (patch) | |
| tree | 45ae25eadbdaba48261ba75ddc5becd3bf5f62aa | |
| parent | dockerfile minor style changes (diff) | |
| parent | Merge pull request #951 from ngortheone/portable_docker_fixes1 (diff) | |
| download | OpenSMTPD-265045fa1625daab57d5406f5873404cbdeded8a.tar.xz OpenSMTPD-265045fa1625daab57d5406f5873404cbdeded8a.zip | |
Merge branch 'portable' into portable_docker_fixes2
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | smtpd/smtpc.c | 2 | ||||
| -rw-r--r-- | smtpd/srs.c | 2 |
3 files changed, 6 insertions, 0 deletions
@@ -24,6 +24,7 @@ RUN mkdir -p /var/lib/opensmtpd/empty \ && adduser _smtpd -h /var/lib/opensmtpd/empty/ -D -H -s /bin/false \ && adduser _smtpq -h /var/lib/opensmtpd/empty/ -D -H -s /bin/false \ && mkdir -p /var/spool/smtpd \ + && mkdir -p /var/mail \ && chmod 711 /var/spool/smtpd COPY . /opensmtpd @@ -62,6 +63,7 @@ RUN apk add --no-cache \ && adduser _smtpd -h /var/lib/opensmtpd/empty/ -D -H -s /bin/false \ && adduser _smtpq -h /var/lib/opensmtpd/empty/ -D -H -s /bin/false \ && mkdir -p /etc/mail \ + && mkdir -p /var/mail \ && mkdir -p /var/spool/smtpd \ && chmod 711 /var/spool/smtpd diff --git a/smtpd/smtpc.c b/smtpd/smtpc.c index 9dfc4f0e..59479703 100644 --- a/smtpd/smtpc.c +++ b/smtpd/smtpc.c @@ -16,6 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "includes.h" + #include <sys/types.h> #include <sys/socket.h> diff --git a/smtpd/srs.c b/smtpd/srs.c index 05737d8d..bb4f4d9e 100644 --- a/smtpd/srs.c +++ b/smtpd/srs.c @@ -16,6 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "includes.h" + #include <sys/types.h> #include <sys/queue.h> #include <sys/tree.h> |