Skip to content

Commit

Permalink
Bump envoy-build to current images (#14608)
Browse files Browse the repository at this point in the history
- Prevents bazel failure when clang-cl 11.0.0 is installed

Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
  • Loading branch information
wrowe authored Jan 8, 2021
1 parent 4302eb1 commit 6338dcb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl

# Docker sandbox
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:9400637f4aa0232465407447bfda0d3da13549fb
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:11efa5680d987fff33fde4af3cc5ece105015d04
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker
build:docker-sandbox --strategy=Closure=docker
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/envoy-ci/envoy-build:9400637f4aa0232465407447bfda0d3da13549fb
FROM gcr.io/envoy-ci/envoy-build:11efa5680d987fff33fde4af3cc5ece105015d04

ARG USERNAME=vscode
ARG USER_UID=501
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,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 = "3ff9995a5dd3d0e703e602ca3ebd9366de2b5752",
sha256 = "a4c74ce9a62b1c907329d248d4c225abfae8646bc77db8d72de65726632d3571",
version = "f2a7f9ba09660beacfebcd37fc977480ec9a8f50",
sha256 = "ca9975f6d5370843167b9646028ca7a0b546f8821f217c9d9d2e033a94a35f31",
strip_prefix = "envoy-build-tools-{version}",
urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
release_date = "2020-12-21",
release_date = "2021-01-04",
use_category = ["build"],
),
boringssl = dict(
Expand Down
4 changes: 2 additions & 2 deletions examples/wasm-cc/docker-compose-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.7"
services:

wasm_compile_update:
image: envoyproxy/envoy-build-ubuntu:9400637f4aa0232465407447bfda0d3da13549fb
image: envoyproxy/envoy-build-ubuntu:11efa5680d987fff33fde4af3cc5ece105015d04
command: |
bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_updated_example.wasm \
&& cp -a bazel-bin/examples/wasm-cc/* /build"
Expand All @@ -13,7 +13,7 @@ services:
- ./lib:/build

wasm_compile:
image: envoyproxy/envoy-build-ubuntu:9400637f4aa0232465407447bfda0d3da13549fb
image: envoyproxy/envoy-build-ubuntu:11efa5680d987fff33fde4af3cc5ece105015d04
command: |
bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_example.wasm \
&& cp -a bazel-bin/examples/wasm-cc/* /build"
Expand Down

0 comments on commit 6338dcb

Please sign in to comment.