From 96492348cb12aa5d15c07ca45648173792be51a5 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Fri, 29 Nov 2019 18:24:39 +0200 Subject: [PATCH] deployment/docker/certs: update TLS certs source from alpine:3.9 to alpine:3.10 --- app/victoria-metrics/deployment/Dockerfile | 2 +- app/vmbackup/deployment/Dockerfile | 2 +- app/vmrestore/deployment/Dockerfile | 2 +- deployment/docker/Makefile | 2 +- deployment/docker/certs/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/victoria-metrics/deployment/Dockerfile b/app/victoria-metrics/deployment/Dockerfile index f47a803a6..4f0a6933c 100644 --- a/app/victoria-metrics/deployment/Dockerfile +++ b/app/victoria-metrics/deployment/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -COPY --from=local/certs:1.0.2 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=local/certs:1.0.3 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY bin/victoria-metrics-prod . EXPOSE 8428 ENTRYPOINT ["/victoria-metrics-prod"] diff --git a/app/vmbackup/deployment/Dockerfile b/app/vmbackup/deployment/Dockerfile index 058035376..eb78fa786 100644 --- a/app/vmbackup/deployment/Dockerfile +++ b/app/vmbackup/deployment/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -COPY --from=local/certs:1.0.2 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=local/certs:1.0.3 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY bin/vmbackup-prod . EXPOSE 8428 ENTRYPOINT ["/vmbackup-prod"] diff --git a/app/vmrestore/deployment/Dockerfile b/app/vmrestore/deployment/Dockerfile index 8c29af5da..31967ae52 100644 --- a/app/vmrestore/deployment/Dockerfile +++ b/app/vmrestore/deployment/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -COPY --from=local/certs:1.0.2 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=local/certs:1.0.3 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY bin/vmrestore-prod . EXPOSE 8428 ENTRYPOINT ["/vmrestore-prod"] diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index adce18612..6a8ca60ac 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -1,6 +1,6 @@ DOCKER_NAMESPACE := victoriametrics BUILDER_IMAGE := local/builder:go1.13.4 -CERTS_IMAGE := local/certs:1.0.2 +CERTS_IMAGE := local/certs:1.0.3 package-certs: (docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(CERTS_IMAGE)') \ diff --git a/deployment/docker/certs/Dockerfile b/deployment/docker/certs/Dockerfile index c76c9ec57..cc5e2e089 100644 --- a/deployment/docker/certs/Dockerfile +++ b/deployment/docker/certs/Dockerfile @@ -1,3 +1,3 @@ # See https://medium.com/on-docker/use-multi-stage-builds-to-inject-ca-certs-ad1e8f01de1b -FROM alpine:3.9 as certs +FROM alpine:3.10 as certs RUN apk --update add ca-certificates