From 8c23bc688e2179b8b2f6c49a2ffd840cd532180a Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Tue, 24 Nov 2020 10:41:13 +0100 Subject: [PATCH] Updating docker image for letsencrypt CA and Alpine 3.12 --- resources/com/cadoles/tamarin/Dockerfile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/resources/com/cadoles/tamarin/Dockerfile b/resources/com/cadoles/tamarin/Dockerfile index afb04be..5a36a00 100644 --- a/resources/com/cadoles/tamarin/Dockerfile +++ b/resources/com/cadoles/tamarin/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.12 ARG HTTP_PROXY= ARG HTTPS_PROXY= @@ -7,7 +7,20 @@ ARG https_proxy= ARG TAMARIN_VERSION=develop -RUN apk add --no-cache git docker python3 bash +RUN apk add --no-cache git docker python3 bash openssl + +ADD https://letsencrypt.org/certs/isrgrootx1.pem.txt /usr/local/share/ca-certificates/isrgrootx1.pem +ADD https://letsencrypt.org/certs/isrg-root-x2.pem /usr/local/share/ca-certificates/isrg-root-x2.pem +ADD https://letsencrypt.org/certs/trustid-x3-root.pem.txt /usr/local/share/ca-certificates/trustid-x3-root.pem +ADD https://letsencrypt.org/certs/letsencryptauthorityx3.pem /usr/local/share/ca-certificates/letsencryptauthorityx3.pem + +RUN cd /usr/local/share/ca-certificates \ + && openssl x509 -in isrgrootx1.pem -inform PEM -out isrgrootx1.crt \ + && openssl x509 -in trustid-x3-root.pem -inform PEM -out trustid-x3-root.crt \ + && openssl x509 -in letsencryptauthorityx3.pem -inform PEM -out letsencryptauthorityx3.crt \ + && openssl x509 -in isrg-root-x2.pem -inform PEM -out isrg-root-x2.crt + +RUN update-ca-certificates RUN git clone http://forge.cadoles.com/Cadoles/Tamarin /tamarin\ && cd /tamarin\ @@ -23,4 +36,4 @@ VOLUME /dist ADD run-tamarin.sh /usr/local/bin/run-tamarin RUN chmod +x /usr/local/bin/run-tamarin -CMD /usr/local/bin/run-tamarin \ No newline at end of file +CMD /usr/local/bin/run-tamarin