[ACME] Fix license issue

master
André 2017-11-16 14:57:17 +01:00
parent 49c475cd78
commit 5211ab10ed
3 changed files with 24 additions and 3 deletions

View File

@ -4,13 +4,29 @@ LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
RUN apk add --update --no-cache \ RUN apk add --update --no-cache \
bash \ bash \
acme-client \
curl \ curl \
openssl \ openssl \
bind-tools \ bind-tools \
jq \ jq \
libressl-dev \
libbsd-dev \
libseccomp-dev \
mariadb-client \ mariadb-client \
tini tini \
make \
gcc \
libressl \
libc-dev \
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
COPY docker-entrypoint.sh /srv/docker-entrypoint.sh COPY docker-entrypoint.sh /srv/docker-entrypoint.sh

View File

@ -8,6 +8,11 @@ if [[ "${SKIP_LETS_ENCRYPT}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
exec $(readlink -f "$0") exec $(readlink -f "$0")
fi fi
echo "Waiting for Docker API..."
until ping dockerapi -c1 > /dev/null; do
sleep 1
done
ACME_BASE=/var/lib/acme ACME_BASE=/var/lib/acme
SSL_EXAMPLE=/var/lib/ssl-example SSL_EXAMPLE=/var/lib/ssl-example

View File

@ -252,7 +252,7 @@ services:
depends_on: depends_on:
- nginx-mailcow - nginx-mailcow
- mysql-mailcow - mysql-mailcow
image: mailcow/acme:1.23 image: mailcow/acme:1.24
build: ./data/Dockerfiles/acme build: ./data/Dockerfiles/acme
dns: dns:
- 172.22.1.254 - 172.22.1.254