From bbb8fc8fb6dfb4d68d456dbcd75ee5480b82835d Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 21 Feb 2023 17:15:15 -0800 Subject: [PATCH 1/3] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4882f1b46d9..45bef496c23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,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.15 as official +FROM docker.mirror.hashicorp.services/alpine:3.17 as official # This is the release of Consul to pull in. ARG VERSION @@ -109,7 +109,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.15 as default +FROM docker.mirror.hashicorp.services/alpine:3.17 as default ARG PRODUCT_VERSION ARG BIN_NAME From ce1f2ead4a65ed7e2d61241bc07cff9bd323b08b Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 21 Feb 2023 17:18:06 -0800 Subject: [PATCH 2/3] Create 16349.txt --- .changelog/16349.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/16349.txt diff --git a/.changelog/16349.txt b/.changelog/16349.txt new file mode 100644 index 00000000000..532a6d56e40 --- /dev/null +++ b/.changelog/16349.txt @@ -0,0 +1,3 @@ +```release-note:improvement +docker: Bump base image to Alpine 3.17. +``` From 41b097ab1de3b3ad459bfe0cee8a98d3452d4f01 Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 21 Feb 2023 17:25:27 -0800 Subject: [PATCH 3/3] Update 16349.txt --- .changelog/16349.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/16349.txt b/.changelog/16349.txt index 532a6d56e40..2736bbab534 100644 --- a/.changelog/16349.txt +++ b/.changelog/16349.txt @@ -1,3 +1,3 @@ ```release-note:improvement -docker: Bump base image to Alpine 3.17. +docker: Update alpine to 3.17 in the Docker image. ```