From d4281f293b1b5ce53b65169df459a4064eee9b27 Mon Sep 17 00:00:00 2001 From: Peter Fern Date: Sun, 26 Jan 2020 16:31:47 +1100 Subject: [PATCH] Update alpine base image to v3.11 Per discussion here: https://discourse.drone.io/t/alpine-3-9-includes-musl-version-vulnerable-to-cve-2019-14697/6679 --- docker/Dockerfile.agent.linux.amd64 | 4 ++-- docker/Dockerfile.controller.linux.amd64 | 4 ++-- docker/Dockerfile.controller.linux.arm | 4 ++-- docker/Dockerfile.controller.linux.arm64 | 4 ++-- docker/Dockerfile.server.linux.amd64 | 4 ++-- docker/Dockerfile.server.linux.arm | 4 ++-- docker/Dockerfile.server.linux.arm64 | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker/Dockerfile.agent.linux.amd64 b/docker/Dockerfile.agent.linux.amd64 index 210a8e7f0..3dd9362dc 100644 --- a/docker/Dockerfile.agent.linux.amd64 +++ b/docker/Dockerfile.agent.linux.amd64 @@ -1,7 +1,7 @@ -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 ENV GODEBUG netdns=go ENV DRONE_RUNNER_OS=linux ENV DRONE_RUNNER_ARCH=amd64 diff --git a/docker/Dockerfile.controller.linux.amd64 b/docker/Dockerfile.controller.linux.amd64 index cf1db6fde..0a0953c9f 100644 --- a/docker/Dockerfile.controller.linux.amd64 +++ b/docker/Dockerfile.controller.linux.amd64 @@ -1,7 +1,7 @@ -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 ENV GODEBUG netdns=go ENV DRONE_RUNNER_OS=linux ENV DRONE_RUNNER_ARCH=amd64 diff --git a/docker/Dockerfile.controller.linux.arm b/docker/Dockerfile.controller.linux.arm index 873ee7824..e5af6e16a 100644 --- a/docker/Dockerfile.controller.linux.arm +++ b/docker/Dockerfile.controller.linux.arm @@ -1,7 +1,7 @@ -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 ENV GODEBUG=netdns=go ENV DRONE_RUNNER_OS=linux ENV DRONE_RUNNER_ARCH=arm diff --git a/docker/Dockerfile.controller.linux.arm64 b/docker/Dockerfile.controller.linux.arm64 index 54afa6876..d872c2dcf 100644 --- a/docker/Dockerfile.controller.linux.arm64 +++ b/docker/Dockerfile.controller.linux.arm64 @@ -1,7 +1,7 @@ -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 ENV GODEBUG=netdns=go ENV DRONE_RUNNER_OS=linux ENV DRONE_RUNNER_ARCH=arm64 diff --git a/docker/Dockerfile.server.linux.amd64 b/docker/Dockerfile.server.linux.amd64 index cbbb948b5..3e669ca17 100644 --- a/docker/Dockerfile.server.linux.amd64 +++ b/docker/Dockerfile.server.linux.amd64 @@ -1,9 +1,9 @@ # docker build --rm -f docker/Dockerfile -t drone/drone . -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 EXPOSE 80 443 VOLUME /data diff --git a/docker/Dockerfile.server.linux.arm b/docker/Dockerfile.server.linux.arm index de7048376..1b6ce60b7 100644 --- a/docker/Dockerfile.server.linux.arm +++ b/docker/Dockerfile.server.linux.arm @@ -1,9 +1,9 @@ # docker build --rm -f docker/Dockerfile -t drone/drone . -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 EXPOSE 80 443 VOLUME /data diff --git a/docker/Dockerfile.server.linux.arm64 b/docker/Dockerfile.server.linux.arm64 index d09694267..b83678b14 100644 --- a/docker/Dockerfile.server.linux.arm64 +++ b/docker/Dockerfile.server.linux.arm64 @@ -1,9 +1,9 @@ # docker build --rm -f docker/Dockerfile -t drone/drone . -FROM alpine:3.9 as alpine +FROM alpine:3.11 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.9 +FROM alpine:3.11 EXPOSE 80 443 VOLUME /data