Skip to content

Commit

Permalink
build/image: Update to 56f235b (envoyproxy#29636)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <ryan@synca.io>
  • Loading branch information
phlax authored Sep 15, 2023
1 parent ff7e210 commit 0b35e75
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,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:1f2f7ee78f894859de0fa7a415b0bedde1f6c560@sha256:6a6a64be3f4e3c4380531ad1624f9419d1fe99dde4e5eeb04e2d538a92f27205
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:56f235b141079013e64912d676fe7da981368402@sha256:d44499c6fd28a8a6a75dc61668b8a9e7bc3d99db11f9a61e8ea1d1f39c20a236
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:1f2f7ee78f894859de0fa7a415b0bedde1f6c560@sha256:9db54410ba9f8216cac84391ebcfb18a297c2217690c7c77bb050f78f56bb629
FROM gcr.io/envoy-ci/envoy-build:56f235b141079013e64912d676fe7da981368402@sha256:6e3e8bd34ba568befa3f9c2fd067a1d82c1e55f0f597bcc5fddebbb644930761

ARG USERNAME=vscode
ARG USER_UID=501
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ on:
default: envoyproxy/envoy-build-ubuntu
build_image_sha:
type: string
default: 6a6a64be3f4e3c4380531ad1624f9419d1fe99dde4e5eeb04e2d538a92f27205
default: d44499c6fd28a8a6a75dc61668b8a9e7bc3d99db11f9a61e8ea1d1f39c20a236
build_image_mobile_sha:
type: string
default: 2c9852c10f133f780a96286230b7e07582e1c99fe204943d4fa66567f8b850f6
default: b3cfc59c2fd1a86a2b12d303324f33d7f7248458233f3be2959fab119b11fa6f
build_image_tag:
type: string
default: 1f2f7ee78f894859de0fa7a415b0bedde1f6c560
default: 56f235b141079013e64912d676fe7da981368402

check_mobile_run:
type: boolean
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,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 = "b3e8ecd0f256b648a19d0f2146a966c2a6a0c0e7",
sha256 = "40ae52a50987feeef25510a37108aad621f4ba0ea7420d898cefd239ee56b178",
version = "633f57439ba683c1370fb8b1025680f1ce678caf",
sha256 = "88e4b7d12429d488daff522b765f0f21a3204d2c4b262b4b9d67587230415454",
strip_prefix = "envoy-build-tools-{version}",
urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
release_date = "2023-09-03",
release_date = "2023-09-15",
use_category = ["build"],
license = "Apache-2.0",
license_url = "https://github.com/envoyproxy/envoy-build-tools/blob/{version}/LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion examples/shared/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy-build-ubuntu:1f2f7ee78f894859de0fa7a415b0bedde1f6c560@sha256:6a6a64be3f4e3c4380531ad1624f9419d1fe99dde4e5eeb04e2d538a92f27205
FROM envoyproxy/envoy-build-ubuntu:56f235b141079013e64912d676fe7da981368402@sha256:d44499c6fd28a8a6a75dc61668b8a9e7bc3d99db11f9a61e8ea1d1f39c20a236
ENV DEBIAN_FRONTEND=noninteractive
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
Expand Down
4 changes: 2 additions & 2 deletions mobile/third_party/rbe_configs/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ platform(
"@bazel_tools//tools/cpp:clang",
],
exec_properties = {
"container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-1f2f7ee78f894859de0fa7a415b0bedde1f6c560@sha256:2c9852c10f133f780a96286230b7e07582e1c99fe204943d4fa66567f8b850f6",
"container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-56f235b141079013e64912d676fe7da981368402@sha256:b3cfc59c2fd1a86a2b12d303324f33d7f7248458233f3be2959fab119b11fa6f",
"OSFamily": "Linux",
"Pool": "linux",
},
Expand All @@ -57,7 +57,7 @@ platform(
"@bazel_tools//tools/cpp:clang",
],
exec_properties = {
"container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-1f2f7ee78f894859de0fa7a415b0bedde1f6c560@sha256:2c9852c10f133f780a96286230b7e07582e1c99fe204943d4fa66567f8b850f6",
"container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-56f235b141079013e64912d676fe7da981368402@sha256:b3cfc59c2fd1a86a2b12d303324f33d7f7248458233f3be2959fab119b11fa6f",
"OSFamily": "Linux",
"Pool": "linux",
# Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the
Expand Down

0 comments on commit 0b35e75

Please sign in to comment.