From 1a8d1ec8a1274162b542173c687fd1c359fae2db Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 14 Jun 2023 00:31:40 +0000 Subject: [PATCH 1/2] backport of commit 189786c0232009b6232713e8fe98c50654e68b46 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 065156752ea..7599ec7b35b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ # Official docker image that includes binaries from releases.hashicorp.com. This # downloads the release from releases.hashicorp.com and therefore requires that # the release is published before building the Docker image. -FROM docker.mirror.hashicorp.services/alpine:3.17 as official +FROM docker.mirror.hashicorp.services/alpine:3.18 as official # This is the release of Consul to pull in. ARG VERSION @@ -112,7 +112,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"] # Production docker image that uses CI built binaries. # Remember, this image cannot be built locally. -FROM docker.mirror.hashicorp.services/alpine:3.17 as default +FROM docker.mirror.hashicorp.services/alpine:3.18 as default ARG PRODUCT_VERSION ARG BIN_NAME From c2b73f4d9e4c941f17b5af11d780e660b8e29ed5 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 14 Jun 2023 00:33:22 +0000 Subject: [PATCH 2/2] backport of commit fceeebd3ae85db510a5cdcf0cd8288bbacf2f59e --- .changelog/17719.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/17719.txt diff --git a/.changelog/17719.txt b/.changelog/17719.txt new file mode 100644 index 00000000000..f45370b3f7d --- /dev/null +++ b/.changelog/17719.txt @@ -0,0 +1,3 @@ +```release-note:security +Bump Dockerfile base image to `alpine:3.18`. + ```