From d6cebcd1024444f98eabc1cca7b0dcc7ab339911 Mon Sep 17 00:00:00 2001 From: Youri Tolstoy Date: Mon, 15 Jul 2019 14:05:01 +0200 Subject: [PATCH 1/3] Update Dockerfile remove docker dependency --- optional/traefik-certdumper/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optional/traefik-certdumper/Dockerfile b/optional/traefik-certdumper/Dockerfile index bfafe245..a7127ce1 100644 --- a/optional/traefik-certdumper/Dockerfile +++ b/optional/traefik-certdumper/Dockerfile @@ -1,6 +1,6 @@ FROM ldez/traefik-certs-dumper -RUN apk --no-cache add inotify-tools util-linux bash docker +RUN apk --no-cache add inotify-tools util-linux bash COPY run.sh / From bfe4798e06d7c499b05ceb26715276e5a51a6a7b Mon Sep 17 00:00:00 2001 From: Youri Tolstoy Date: Mon, 15 Jul 2019 14:05:59 +0200 Subject: [PATCH 2/3] Update run.sh update command according to ldez/traefik-certs-dumper --- optional/traefik-certdumper/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optional/traefik-certdumper/run.sh b/optional/traefik-certdumper/run.sh index 6799946a..eeb45ac0 100755 --- a/optional/traefik-certdumper/run.sh +++ b/optional/traefik-certdumper/run.sh @@ -3,7 +3,7 @@ function dump() { echo "$(date) Dumping certificates" - traefik-certs-dumper dump --crt-name "cert" --crt-ext ".pem" --key-name "key" --key-ext ".pem" --domain-subdir=true --dest /tmp/work --source /traefik/acme.json > /dev/null + traefik-certs-dumper file --crt-name "cert" --crt-ext ".pem" --key-name "key" --key-ext ".pem" --domain-subdir --dest /tmp/work --source /traefik/acme.json > /dev/null if diff -q /tmp/work/${DOMAIN}/cert.pem /output/cert.pem >/dev/null && \ diff -q /tmp/work/${DOMAIN}/key.pem /output/key.pem >/dev/null ; then From 62b17a0a7bf94e85f7f9d965295c05fb5b31516b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Thu, 25 Jul 2019 22:47:36 +0300 Subject: [PATCH 3/3] Revert "Stop building certdumper since it is not supported by traefik anymore" This reverts commit 0b484a8c2d804f8f29808428d33d96fe2e81d25e. --- tests/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/build.yml b/tests/build.yml index b44bc745..dd56dc41 100644 --- a/tests/build.yml +++ b/tests/build.yml @@ -30,9 +30,9 @@ services: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-local} build: ../optional/radicale -# traefik-certdumper: -# image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}traefik-certdumper:${MAILU_VERSION:-local} -# build: ../optional/traefik-certdumper + traefik-certdumper: + image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}traefik-certdumper:${MAILU_VERSION:-local} + build: ../optional/traefik-certdumper admin: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-local}