Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of Dockerfile: bump Alpine base image to 3.17 into release/0.49.x #1936

Merged
merged 2 commits into from
Feb 22, 2023
Merged

Backport of Dockerfile: bump Alpine base image to 3.17 into release/0.49.x #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28a5af
no-op commit due to failed cherry-picking
Feb 22, 2023
16a151a
merge conflict
david-yu Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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