From 402b68ff682669ebcd6fe604703aaa9d9faf8f7e Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Tue, 13 Jun 2023 21:17:02 -0400 Subject: [PATCH] Backport of Bump Alpine to 3.18 into release/1.16.x (#17725) * backport of commit 189786c0232009b6232713e8fe98c50654e68b46 * backport of commit fceeebd3ae85db510a5cdcf0cd8288bbacf2f59e --------- Co-authored-by: David Yu --- .changelog/17719.txt | 3 +++ Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .changelog/17719.txt diff --git a/.changelog/17719.txt b/.changelog/17719.txt new file mode 100644 index 000000000..f45370b3f --- /dev/null +++ b/.changelog/17719.txt @@ -0,0 +1,3 @@ +```release-note:security +Bump Dockerfile base image to `alpine:3.18`. + ``` diff --git a/Dockerfile b/Dockerfile index 065156752..7599ec7b3 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