From 37faed9e3fdaf37b39e8ca9c320e02aabe5c7358 Mon Sep 17 00:00:00 2001 From: "dependency-envoy[bot]" <148525496+dependency-envoy[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:41:26 +0000 Subject: [PATCH] deps: Bump build images -> `6eba113` (#31372) Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com> --- .bazelrc | 4 ++-- .devcontainer/Dockerfile | 2 +- .github/config.yml | 8 ++++---- examples/shared/build/Dockerfile | 2 +- mobile/third_party/rbe_configs/config/BUILD | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bazelrc b/.bazelrc index a5b1ab886dba..df66d82946b7 100644 --- a/.bazelrc +++ b/.bazelrc @@ -357,7 +357,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request # Docker sandbox # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8 -build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:7467652575122d8d54e767a68f141598bd855383@sha256:8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849 +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669 build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker @@ -518,7 +518,7 @@ build:rbe-envoy-engflow --grpc_keepalive_time=30s build:rbe-envoy-engflow --remote_timeout=3600s build:rbe-envoy-engflow --bes_timeout=3600s build:rbe-envoy-engflow --bes_upload_mode=fully_async -build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:7467652575122d8d54e767a68f141598bd855383@sha256:8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849 +build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669 ############################################################################# # debug: Various Bazel debugging flags diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 62ba4e83d738..d1329f4f8aa8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/envoy-ci/envoy-build:7467652575122d8d54e767a68f141598bd855383@sha256:af98298b715958527d3c3b42ae968a09223d237c843e129c586b7e76b8c69a0d +FROM gcr.io/envoy-ci/envoy-build:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:56466807485ba97d3ae79b4fa54cf9723bd9eb327783917d4bdc736483e5d72a ARG USERNAME=vscode ARG USER_UID=501 diff --git a/.github/config.yml b/.github/config.yml index 69a9b6b2c15e..ffa12f151beb 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -2,11 +2,11 @@ agent-ubuntu: ubuntu-22.04 build-image: # Authoritative configuration for build image/s repo: envoyproxy/envoy-build-ubuntu - sha: 8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849 - mobile-sha: 292273a428ebb093cc69c2f225c7c4218ff2ea84e0cb6ee80e7a6771a09e026f + sha: d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669 + mobile-sha: 82a79f368aa7da9a3ed904352deb24e6e52c5eae156fdc5ca2fb3fca6650ed6d # this is authoritative, but is not currently used in github ci - gcr-sha: af98298b715958527d3c3b42ae968a09223d237c843e129c586b7e76b8c69a0d - tag: 7467652575122d8d54e767a68f141598bd855383 + gcr-sha: 56466807485ba97d3ae79b4fa54cf9723bd9eb327783917d4bdc736483e5d72a + tag: 6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c config: envoy: diff --git a/examples/shared/build/Dockerfile b/examples/shared/build/Dockerfile index 7c2b63fe5b1f..fc548e6d8c62 100644 --- a/examples/shared/build/Dockerfile +++ b/examples/shared/build/Dockerfile @@ -1,4 +1,4 @@ -FROM envoyproxy/envoy-build-ubuntu:7467652575122d8d54e767a68f141598bd855383@sha256:8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849 +FROM envoyproxy/envoy-build-ubuntu:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669 ENV DEBIAN_FRONTEND=noninteractive RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ diff --git a/mobile/third_party/rbe_configs/config/BUILD b/mobile/third_party/rbe_configs/config/BUILD index df1b76d803e9..34111494ce5c 100644 --- a/mobile/third_party/rbe_configs/config/BUILD +++ b/mobile/third_party/rbe_configs/config/BUILD @@ -42,7 +42,7 @@ platform( "@bazel_tools//tools/cpp:clang", ], exec_properties = { - "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-7467652575122d8d54e767a68f141598bd855383@sha256:292273a428ebb093cc69c2f225c7c4218ff2ea84e0cb6ee80e7a6771a09e026f", + "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:82a79f368aa7da9a3ed904352deb24e6e52c5eae156fdc5ca2fb3fca6650ed6d", "OSFamily": "Linux", "Pool": "linux", }, @@ -57,7 +57,7 @@ platform( "@bazel_tools//tools/cpp:clang", ], exec_properties = { - "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-7467652575122d8d54e767a68f141598bd855383@sha256:292273a428ebb093cc69c2f225c7c4218ff2ea84e0cb6ee80e7a6771a09e026f", + "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:82a79f368aa7da9a3ed904352deb24e6e52c5eae156fdc5ca2fb3fca6650ed6d", "OSFamily": "Linux", "Pool": "linux", # Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the