diff --git a/.bazelrc b/.bazelrc index 3f2fab533837e..40eb4e5ac3188 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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:19a268cfe3d12625380e7c61d2467c8779b58b56 +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b19d74904f19043eb196b73357853d5bce35622c build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker diff --git a/.bazelversion b/.bazelversion index 40c341bdcdbe8..7c69a55dbb185 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.6.0 +3.7.0 diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3f0cbcc339119..c482160c27e65 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/envoy-ci/envoy-build:19a268cfe3d12625380e7c61d2467c8779b58b56 +FROM gcr.io/envoy-ci/envoy-build:b19d74904f19043eb196b73357853d5bce35622c ARG USERNAME=vscode ARG USER_UID=501 diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 77a28e6596138..5e41193bf4fc5 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -25,14 +25,14 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "bazel-toolchains", project_desc = "Bazel toolchain configs for RBE", project_url = "https://github.com/bazelbuild/bazel-toolchains", - version = "3.6.0", - sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7", + version = "3.7.0", + sha256 = "8e0633dfb59f704594f19ae996a35650747adc621ada5e8b9fb588f808c89cb0", strip_prefix = "bazel-toolchains-{version}", urls = [ "https://github.com/bazelbuild/bazel-toolchains/releases/download/{version}/bazel-toolchains-{version}.tar.gz", "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/{version}.tar.gz", ], - release_date = "2020-10-08", + release_date = "2020-11-02", use_category = ["build"], ), build_bazel_rules_apple = dict( @@ -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 = "b1a8b205f13ce52143bcb7283c6dd0a53bcd1c6c", - sha256 = "afd67e399fa27fb703fb74dc39ed1f121dfcebc1556bbd1053fa8f22d8b24230", + version = "576c95d7910015184755b15b8294452e026c370e", + sha256 = "ba14e2c115511962a4f882c85935287c8314fa1df6b1cf29c6b2c3d4b3129d79", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2020-10-16", + release_date = "2020-11-19", use_category = ["build"], ), boringssl = dict( diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml index 43c051200fedc..b675f4469a993 100644 --- a/examples/wasm-cc/docker-compose-wasm.yaml +++ b/examples/wasm-cc/docker-compose-wasm.yaml @@ -3,7 +3,7 @@ version: "3.7" services: wasm_compile_update: - image: envoyproxy/envoy-build-ubuntu:19a268cfe3d12625380e7c61d2467c8779b58b56 + image: envoyproxy/envoy-build-ubuntu:b19d74904f19043eb196b73357853d5bce35622c command: | bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_updated_example.wasm \ && cp -a bazel-bin/examples/wasm-cc/* /build" @@ -13,7 +13,7 @@ services: - ./lib:/build wasm_compile: - image: envoyproxy/envoy-build-ubuntu:19a268cfe3d12625380e7c61d2467c8779b58b56 + image: envoyproxy/envoy-build-ubuntu:b19d74904f19043eb196b73357853d5bce35622c command: | bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_example.wasm \ && cp -a bazel-bin/examples/wasm-cc/* /build"