Skip to content

Commit b8c5cb5

Browse files
committed
auto-merge envoyproxy/envoy[release/v1.32] into envoyproxy/envoy-openssl[release/v1.32]
* upstream/release/v1.32: docker: Fix/workaround broken qemu builder (#38415) deps: stop building libcurl docs (#38172) Signed-off-by: tedjpoole <[email protected]>
2 parents 6cf28d7 + 075b5d3 commit b8c5cb5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

bazel/foreign_cc/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ envoy_cmake(
284284
cache_entries = {
285285
"BUILD_CURL_EXE": "off",
286286
"BUILD_TESTING": "off",
287+
"BUILD_LIBCURL_DOCS": "off",
287288
"BUILD_SHARED_LIBS": "off",
288289
"CURL_HIDDEN_SYMBOLS": "off",
289290
"CURL_USE_LIBSSH2": "off",

ci/docker_ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ config_env() {
8484
fi
8585

8686
# Install QEMU emulators
87-
docker run --rm --privileged tonistiigi/binfmt --install all
87+
docker run --rm --privileged tonistiigi/binfmt:qemu-v7.0.0 --install all
8888

8989
# Remove older build instance
9090
docker buildx rm multi-builder 2> /dev/null || :

0 commit comments

Comments
 (0)