[Dovecot] Dovecot 2.3 from git for temp fixes
[ACME] Use -a switch (thanks to jas8522!)master
parent
42923698fd
commit
38aaeeb30b
|
@ -4,30 +4,14 @@ LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
|||
|
||||
RUN apk add --update --no-cache \
|
||||
bash \
|
||||
acme-client \
|
||||
curl \
|
||||
openssl \
|
||||
bind-tools \
|
||||
jq \
|
||||
libressl-dev \
|
||||
libbsd-dev \
|
||||
libseccomp-dev \
|
||||
mariadb-client \
|
||||
tini \
|
||||
make \
|
||||
gcc \
|
||||
libressl \
|
||||
libc-dev \
|
||||
redis \
|
||||
linux-headers \
|
||||
ca-certificates \
|
||||
&& curl -s https://kristaps.bsd.lv/acme-client/snapshots/acme-client-portable.tgz | tar xfvz - \
|
||||
&& cd acme-client-* \
|
||||
&& sed -i 's/LE-SA-v1.1.1-August-1-2016.pdf/LE-SA-v1.2-November-15-2017.pdf/g' main.c \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& cd .. \
|
||||
&& rm -rf acme-client-* \
|
||||
&& apk del libressl-dev libbsd-dev libseccomp-dev libc-dev linux-headers
|
||||
tini
|
||||
|
||||
COPY docker-entrypoint.sh /srv/docker-entrypoint.sh
|
||||
|
||||
|
|
|
@ -225,6 +225,7 @@ while true; do
|
|||
|
||||
ACME_RESPONSE=$(acme-client \
|
||||
-v -e -b -N -n \
|
||||
-a 'https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf' \
|
||||
-f ${ACME_BASE}/acme/private/account.key \
|
||||
-k ${ACME_BASE}/acme/private/privkey.pem \
|
||||
-c ${ACME_BASE}/acme \
|
||||
|
|
|
@ -5,14 +5,15 @@ ARG DEBIAN_FRONTEND=noninteractive
|
|||
ENV LC_ALL C
|
||||
ENV DOVECOT_VERSION 2.3.0
|
||||
ENV PIGEONHOLE_VERSION 0.5.0.1
|
||||
|
||||
ENV ACLOCAL_DIR=m4
|
||||
ENV ACLOCAL="aclocal -Im4"
|
||||
RUN apt-get update && apt-get -y --no-install-recommends install \
|
||||
automake \
|
||||
autotools-dev \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
cpanminus \
|
||||
curl \
|
||||
wget \
|
||||
default-libmysqlclient-dev \
|
||||
libjson-webtoken-perl \
|
||||
libcgi-pm-perl \
|
||||
|
@ -53,7 +54,13 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
|
|||
libproc-processtable-perl \
|
||||
liburi-perl \
|
||||
lzma-dev \
|
||||
git \
|
||||
make \
|
||||
autoconf \
|
||||
automake \
|
||||
pkgconf \
|
||||
libtool \
|
||||
gettext \
|
||||
procps \
|
||||
supervisor \
|
||||
cron \
|
||||
|
@ -63,16 +70,15 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
RUN curl https://www.dovecot.org/releases/2.3/dovecot-$DOVECOT_VERSION.tar.gz | tar xvz \
|
||||
&& cd dovecot-ce-$DOVECOT_VERSION \
|
||||
&& curl -L -o src/lib-compression/ostream-zlib.c https://raw.githubusercontent.com/dovecot/core/master/src/lib-compression/ostream-zlib.c \
|
||||
&& curl -L -o src/doveadm/doveadm-zlib.c https://raw.githubusercontent.com/dovecot/core/43a6cdb3561dcfc5950542ce62509a7747a977ae/src/doveadm/doveadm-zlib.c \
|
||||
&& ./configure --with-mysql --with-lzma --with-lz4 --with-ssl=openssl --with-notify=inotify --with-storages=mdbox,sdbox,maildir,mbox,imapc,pop3c --with-bzlib --with-zlib \
|
||||
RUN git clone https://github.com/dovecot/core.git dovecot \
|
||||
&& cd dovecot \
|
||||
&& ./autogen.sh \
|
||||
&& PANDOC=false ./configure --enable-maintainer-mode --with-mysql --with-lzma --with-lz4 --with-ssl=openssl --with-notify=inotify --with-storages=mdbox,sdbox,maildir,mbox,imapc,pop3c --with-bzlib --with-zlib \
|
||||
&& make -j3 \
|
||||
&& make install \
|
||||
&& make clean \
|
||||
&& cd .. && rm -rf dovecot-ce-$DOVECOT_VERSION \
|
||||
&& curl https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION.tar.gz | tar xvz \
|
||||
&& cd .. && rm -rf dovecot \
|
||||
&& wget -O - https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION.tar.gz | tar xvz \
|
||||
&& cd dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION \
|
||||
&& ./configure \
|
||||
&& make -j3 \
|
||||
|
|
|
@ -146,7 +146,7 @@ services:
|
|||
- sogo
|
||||
|
||||
dovecot-mailcow:
|
||||
image: mailcow/dovecot:1.15
|
||||
image: mailcow/dovecot:1.16
|
||||
build: ./data/Dockerfiles/dovecot
|
||||
cap_add:
|
||||
- NET_BIND_SERVICE
|
||||
|
@ -260,7 +260,7 @@ services:
|
|||
depends_on:
|
||||
- nginx-mailcow
|
||||
- mysql-mailcow
|
||||
image: mailcow/acme:1.27
|
||||
image: mailcow/acme:1.28
|
||||
build: ./data/Dockerfiles/acme
|
||||
dns:
|
||||
- 172.22.1.254
|
||||
|
|
Loading…
Reference in New Issue