Fixes
This commit is contained in:
@@ -5,7 +5,7 @@ WORKDIR /app
|
||||
|
||||
COPY requirements-prod.txt requirements.txt
|
||||
RUN apk add --no-cache openssl \
|
||||
&& apk add --no-cache --virtual build-dep openssl-dev libffi-dev python-dev build-base \
|
||||
&& apk add --no-cache --virtual build-dep openssl-dev libffi-dev python3-dev build-base \
|
||||
&& pip install -r requirements.txt \
|
||||
&& apk del build-dep
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ FROM alpine:3.13
|
||||
|
||||
RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
|
||||
&& apk add --no-cache \
|
||||
dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
|
||||
rspamd-client@testing python py-jinja2
|
||||
dovecot dovecot-sqlite dovecot-pigeonhole-plugin \
|
||||
rspamd-client python3 py3-jinja2
|
||||
|
||||
COPY conf /conf
|
||||
COPY sieve /var/lib/dovecot
|
||||
|
||||
@@ -5,7 +5,7 @@ import os
|
||||
import socket
|
||||
import glob
|
||||
import shutil
|
||||
|
||||
|
||||
convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))
|
||||
|
||||
# Actual startup script
|
||||
@@ -33,6 +33,6 @@ convert("/conf/rsyslog.conf", "/etc/rsyslog.conf")
|
||||
# Run postfix
|
||||
if os.path.exists("/var/run/rsyslogd.pid"):
|
||||
os.remove("/var/run/rsyslogd.pid")
|
||||
os.system("/usr/lib/postfix/post-install meta_directory=/etc/postfix create-missing")
|
||||
os.system("/usr/lib/postfix/master &")
|
||||
os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing")
|
||||
os.system("/usr/sbin/postfix start")
|
||||
os.execv("/usr/sbin/rsyslogd", ["rsyslogd", "-n"])
|
||||
|
||||
Reference in New Issue
Block a user