Skip to content

Commit

Permalink
Backport of Dockerfile: bump Alpine base image to 3.17 into release/0…
Browse files Browse the repository at this point in the history
….49.x (#1936)

* Manual backport to 0.49.x
Co-authored-by: David Yu <[email protected]>
  • Loading branch information
Ashwin Venkatesh authored Feb 22, 2023
1 parent d39bfd4 commit 48bcc90
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## UNRELEASED

IMPROVEMENTS:
* Control Plane
* Update alpine to 3.17 in the Docker image. [[GH-1934](https://github.com/hashicorp/consul-k8s/pull/1934)]

## 0.49.4 (February 7, 2023)

BREAKING CHANGES:
Expand Down
4 changes: 2 additions & 2 deletions control-plane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# -----------------------------------
# BIN_NAME is a requirement in the hashicorp docker github action

FROM alpine:3.16 AS dev
FROM alpine:3.17 AS dev

# NAME and VERSION are the name of the software in releases.hashicorp.com
# and the version to download. Example: NAME=consul VERSION=1.2.3.
Expand Down Expand Up @@ -66,7 +66,7 @@ CMD /bin/${BIN_NAME}
# We don't rebuild the software because we want the exact checksums and
# binary signatures to match the software and our builds aren't fully
# reproducible currently.
FROM alpine:3.16 AS release-default
FROM alpine:3.17 AS release-default

ARG BIN_NAME=consul-k8s-control-plane
ARG CNI_BIN_NAME=consul-cni
Expand Down

0 comments on commit 48bcc90

Please sign in to comment.