From 3efaecfdbcbd3beebc21568581f451ef6f5e4868 Mon Sep 17 00:00:00 2001
From: Lizan Zhou <lizan@tetrate.io>
Date: Mon, 16 May 2022 03:59:05 -0700
Subject: [PATCH] build: update image with deps upgrade (#21278)

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
---
 .bazelrc                                                 | 2 +-
 .devcontainer/Dockerfile                                 | 2 +-
 bazel/repository_locations.bzl                           | 6 +++---
 examples/wasm-cc/docker-compose-wasm.yaml                | 4 ++--
 test/extensions/transport_sockets/tls/test_data/certs.sh | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 43223eb0b2f5..47b6c7de5d26 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -284,7 +284,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:6fff5a6c67db843ddabde4533e24cab6122c7011
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
 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 84a09a23796d..b00935ebbdf7 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:6fff5a6c67db843ddabde4533e24cab6122c7011
+FROM gcr.io/envoy-ci/envoy-build:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
 
 ARG USERNAME=vscode
 ARG USER_UID=501
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index e00e051e1dd7..2d2655133508 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 = "afae694ee4b0036ee645db50ee2d972ee99c0ae5",
-        sha256 = "1c7502d489b9b36076fd338e2032e17a0c9cc9809048683a2e32ad8345445723",
+        version = "9cdf86f3fe383c7f894d1814da3f0bc5bec8c8c4",
+        sha256 = "88e76fdd6b2ee52e66b6b5933eb25e4263285c8b6133b330699c8796c28da606",
         strip_prefix = "envoy-build-tools-{version}",
         urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
-        release_date = "2022-05-05",
+        release_date = "2022-05-12",
         use_category = ["build"],
     ),
     boringssl = dict(
diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml
index dd400287f0d8..90ff55eded2d 100644
--- a/examples/wasm-cc/docker-compose-wasm.yaml
+++ b/examples/wasm-cc/docker-compose-wasm.yaml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   wasm_compile_update:
-    image: envoyproxy/envoy-build-ubuntu:6fff5a6c67db843ddabde4533e24cab6122c7011
+    image: envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
     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:6fff5a6c67db843ddabde4533e24cab6122c7011
+    image: envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
     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
diff --git a/test/extensions/transport_sockets/tls/test_data/certs.sh b/test/extensions/transport_sockets/tls/test_data/certs.sh
index 850e7470fdef..2e2f300b4fa5 100755
--- a/test/extensions/transport_sockets/tls/test_data/certs.sh
+++ b/test/extensions/transport_sockets/tls/test_data/certs.sh
@@ -113,7 +113,7 @@ generate_cert_chain() {
         then
             ca_name="i$((x - 1))"
         fi
-        echo $x: $certname $ca_name
+        echo "$x: $certname $ca_name"
         generate_ca $certname $ca_name
     done
     for x in {1..3}; do