Skip to content

Commit

Permalink
Bump alpine image (#22009)
Browse files Browse the repository at this point in the history
bump alpine image
  • Loading branch information
sarahalsmiller authored Dec 17, 2024
1 parent c181a53 commit 4adb3f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
7 changes: 0 additions & 7 deletions .release/security-scan.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ container {
triage {
suppress {
vulnerabilities = [
"CVE-2024-8096", # [email protected],
"CVE-2024-9143", # [email protected],
"CVE-2024-3596", # [email protected],
"CVE-2024-2236", # [email protected],
"CVE-2024-26458", # [email protected],
"CVE-2024-2511", # [email protected],
#the above can be resolved when they're resolved in the alpine image
]
paths = [
"internal/tools/proto-gen-rpc-glue/e2e/consul/*",
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.20 as official
FROM docker.mirror.hashicorp.services/alpine:3.21 as official

# This is the release of Consul to pull in.
ARG VERSION
Expand Down Expand Up @@ -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.20 as default
FROM docker.mirror.hashicorp.services/alpine:3.21 as default

ARG PRODUCT_VERSION
ARG BIN_NAME
Expand Down

0 comments on commit 4adb3f2

Please sign in to comment.