From b079da24c58e82d9823d76bf6cb12518faafb9ce Mon Sep 17 00:00:00 2001
From: Ryan Northey <ryan@synca.io>
Date: Thu, 17 Mar 2022 08:29:24 +0000
Subject: [PATCH] repo: Update build image and toolchains

Signed-off-by: Ryan Northey <ryan@synca.io>
---
 .bazelrc                                  | 2 +-
 .devcontainer/Dockerfile                  | 2 +-
 bazel/repository_locations.bzl            | 6 +++---
 examples/wasm-cc/docker-compose-wasm.yaml | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 80eef8d7e09f1..b17f12b3ee270 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -277,7 +277,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # 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:d859a503314ae611bb7ca4a7b4b4a19194e199f0
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:142e6d5662b98277a84c327da26ed266ab0e3191
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a8e8f3a49cbee..27cc537dff092 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:d859a503314ae611bb7ca4a7b4b4a19194e199f0
+FROM gcr.io/envoy-ci/envoy-build:142e6d5662b98277a84c327da26ed266ab0e3191
 
 ARG USERNAME=vscode
 ARG USER_UID=501
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index aa62957829d6b..73efaef908d0c 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -64,11 +64,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "envoy-build-tools",
         project_desc = "Common build tools shared by the Envoy/UDPA ecosystem",
         project_url = "https://github.com/envoyproxy/envoy-build-tools",
-        version = "f3a70cf47bd91d8f6ab080e4da361cc7f8e6f24d",
-        sha256 = "f18224874887fae1f897fa582fb7aad34fc7604cadb1d3fe92527eabdb8af513",
+        version = "f710be3099b65a2f260a632f8336a2c18e8324b9",
+        sha256 = "c7064405ab9dc4e04343147fc5fd399e90d25ccb849ede0d3e288b2e54c04634",
         strip_prefix = "envoy-build-tools-{version}",
         urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
-        release_date = "2022-03-11",
+        release_date = "2022-03-16",
         use_category = ["build"],
     ),
     boringssl = dict(
diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml
index f89002cf7d148..b7214da955f70 100644
--- a/examples/wasm-cc/docker-compose-wasm.yaml
+++ b/examples/wasm-cc/docker-compose-wasm.yaml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   wasm_compile_update:
-    image: envoyproxy/envoy-build-ubuntu:d859a503314ae611bb7ca4a7b4b4a19194e199f0
+    image: envoyproxy/envoy-build-ubuntu:142e6d5662b98277a84c327da26ed266ab0e3191
     command: |
       bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_updated_example.wasm && cp -a bazel-bin/examples/wasm-cc/* /build"
     working_dir: /source
@@ -11,7 +11,7 @@ services:
     - ./lib:/build
 
   wasm_compile:
-    image: envoyproxy/envoy-build-ubuntu:d859a503314ae611bb7ca4a7b4b4a19194e199f0
+    image: envoyproxy/envoy-build-ubuntu:142e6d5662b98277a84c327da26ed266ab0e3191
     command: |
       bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_example.wasm && cp -a bazel-bin/examples/wasm-cc/* /build"
     working_dir: /source