-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into NET-11798_API_Gateway_TLS_Max_Min_Versions_a…
…nd_CipherSuites_settings_not_respected
- Loading branch information
Showing
15 changed files
with
124 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:security | ||
| Update `golang.org/x/crypto` to v0.31.0 to address [GO-2024-3321](https://pkg.go.dev/vuln/GO-2024-3321). | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| ```release-note:security | ||
| Update `registry.access.redhat.com/ubi9-minimal` image to 9.5 to address [CVE-2024-3596](https://nvd.nist.gov/vuln/detail/CVE-2024-3596),[CVE-2024-2511](https://nvd.nist.gov/vuln/detail/CVE-2024-2511),[CVE-2024-26458](https://nvd.nist.gov/vuln/detail/CVE-2024-26458). | ||
| ``` | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:security | ||
| Update `golang.org/x/net` to v0.33.0 to address [GO-2024-3333](https://pkg.go.dev/vuln/GO-2024-3333). | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,13 +37,8 @@ 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 | ||
| "CVE-2024-4067", # libsolv@0:0.7.24-3.el9 | ||
| "CVE-2019-12900" # bzip2-libs@0:1.0.8-8.el9 | ||
| ] | ||
| paths = [ | ||
| "internal/tools/proto-gen-rpc-glue/e2e/consul/*", | ||
|
|
@@ -84,6 +79,7 @@ binary { | |
| triage { | ||
| suppress { | ||
| vulnerabilities = [ | ||
| "GO-2022-0635", // github.com/aws/[email protected] | ||
| ] | ||
| paths = [ | ||
| "internal/tools/proto-gen-rpc-glue/e2e/consul/*", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -29,6 +29,13 @@ LABEL org.opencontainers.image.authors="Consul Team <[email protected]>" \ | |
| org.opencontainers.image.vendor="HashiCorp" \ | ||
| org.opencontainers.image.title="consul" \ | ||
| org.opencontainers.image.description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| name="Consul" \ | ||
| maintainer="Consul Team <[email protected]>" \ | ||
| vendor="HashiCorp" \ | ||
| release=${PRODUCT_REVISION} \ | ||
| revision=${PRODUCT_REVISION} \ | ||
| summary="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| version=${VERSION} | ||
|
|
||
| # This is the location of the releases. | ||
|
|
@@ -112,7 +119,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 | ||
|
|
@@ -137,6 +144,13 @@ LABEL org.opencontainers.image.authors="Consul Team <[email protected]>" \ | |
| org.opencontainers.image.title="consul" \ | ||
| org.opencontainers.image.description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| org.opencontainers.image.licenses="BSL-1.1" \ | ||
| name="Consul" \ | ||
| maintainer="Consul Team <[email protected]>" \ | ||
| vendor="HashiCorp" \ | ||
| release=${PRODUCT_REVISION} \ | ||
| revision=${PRODUCT_REVISION} \ | ||
| summary="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| version=${PRODUCT_VERSION} | ||
|
|
||
| COPY LICENSE /usr/share/doc/$PRODUCT_NAME/LICENSE.txt | ||
|
|
@@ -203,7 +217,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"] | |
|
|
||
| # Red Hat UBI-based image | ||
| # This target is used to build a Consul image for use on OpenShift. | ||
| FROM registry.access.redhat.com/ubi9-minimal:9.4 as ubi | ||
| FROM registry.access.redhat.com/ubi9-minimal:9.5 as ubi | ||
|
|
||
| ARG PRODUCT_VERSION | ||
| ARG PRODUCT_REVISION | ||
|
|
@@ -227,6 +241,13 @@ LABEL org.opencontainers.image.authors="Consul Team <[email protected]>" \ | |
| org.opencontainers.image.title="consul" \ | ||
| org.opencontainers.image.description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| org.opencontainers.image.licenses="BSL-1.1" \ | ||
| name="Consul" \ | ||
| maintainer="Consul Team <[email protected]>" \ | ||
| vendor="HashiCorp" \ | ||
| release=${PRODUCT_REVISION} \ | ||
| revision=${PRODUCT_REVISION} \ | ||
| summary="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \ | ||
| version=${PRODUCT_VERSION} | ||
|
|
||
| COPY LICENSE /usr/share/doc/$PRODUCT_NAME/LICENSE.txt | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.