From 4cdd2353bed26562c878717a33c05d2234cabd92 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Mon, 23 Jan 2023 21:38:16 +0000 Subject: [PATCH] Revert "build: Bump image -> `7304f974de2` (#25089)" This reverts commit 2c55d6dc6359f91fda40ce849679c7a89590f0e5. Signed-off-by: Ryan Northey --- .bazelrc | 2 +- .devcontainer/Dockerfile | 2 +- .github/workflows/android_tests.yml | 2 +- .github/workflows/asan.yml | 2 +- .github/workflows/cc_tests.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/perf.yml | 6 +++--- .github/workflows/python_tests.yml | 2 +- .github/workflows/tsan.yml | 2 +- bazel/repository_locations.bzl | 6 +++--- examples/shared/build/Dockerfile | 8 ++++++-- mobile/third_party/rbe_configs/config/BUILD | 8 ++++---- 14 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.bazelrc b/.bazelrc index 5a60d3852599..d59e60868582 100644 --- a/.bazelrc +++ b/.bazelrc @@ -295,7 +295,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:7304f974de2724617b7492ccb4c9c58cd420353a +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 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 21d2cdd26354..26a7dd543c6e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/envoy-ci/envoy-build:7304f974de2724617b7492ccb4c9c58cd420353a +FROM gcr.io/envoy-ci/envoy-build:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 ARG USERNAME=vscode ARG USER_UID=501 diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml index 39b592c8a1b8..3b2461ac5ab3 100644 --- a/.github/workflows/android_tests.yml +++ b/.github/workflows/android_tests.yml @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 90 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 env: CC: /opt/llvm/bin/clang CXX: /opt/llvm/bin/clang++ diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 6dcaad9ffbcb..271e331119cc 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 180 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 env: CC: /opt/llvm/bin/clang CXX: /opt/llvm/bin/clang++ diff --git a/.github/workflows/cc_tests.yml b/.github/workflows/cc_tests.yml index 997390295db0..fed0c2485b52 100644 --- a/.github/workflows/cc_tests.yml +++ b/.github/workflows/cc_tests.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 120 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 steps: - uses: actions/checkout@v1 - name: Add safe directory diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e6377b62217c..b8985af4b80a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -15,7 +15,7 @@ jobs: run: shell: bash container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 steps: - uses: actions/checkout@v1 - name: Add safe directory diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c60bfb90a785..83bdf57e000c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 20 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 steps: - uses: actions/checkout@v3 - name: Add safe directory diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 14dfa7a2e5c7..42eeafc28815 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 45 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 env: CLANG_FORMAT: /opt/llvm/bin/clang-format BUILDIFIER_BIN: /usr/local/bin/buildifier diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 731848233cbf..0f95d33f344d 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 120 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 env: CC: /opt/llvm/bin/clang CXX: /opt/llvm/bin/clang++ @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 90 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 env: CC: /opt/llvm/bin/clang CXX: /opt/llvm/bin/clang++ @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 30 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 steps: - uses: actions/checkout@v1 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index c0f432cad018..64e990a8b50b 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 90 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 steps: - uses: actions/checkout@v1 - name: Add safe directory diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 5edf14006a73..7509fb7324bd 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 90 container: - image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a + image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 env: CC: /opt/llvm/bin/clang CXX: /opt/llvm/bin/clang++ diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 17be2d2c1f85..6f47e9ab9b0d 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -90,11 +90,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 = "c9eabcc8dde026715b35f262e30ba628bab5976c", - sha256 = "6b1ef916c5318d54a2ab11c31c5a7fb3a1c0e6fd3dc14d3a46b482c0261b9256", + version = "0f17a22c7902e21e5e003f5296adb628d2f16b2f", + sha256 = "5e47c368092b66fd0bcd488118e8e990b42e5314c385fa9168d50daa95e2515b", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2023-01-21", + release_date = "2022-08-26", use_category = ["build"], license = "Apache-2.0", license_url = "https://github.com/envoyproxy/envoy-build-tools/blob/{version}/LICENSE", diff --git a/examples/shared/build/Dockerfile b/examples/shared/build/Dockerfile index 758d23a51d57..b830ce5990fe 100644 --- a/examples/shared/build/Dockerfile +++ b/examples/shared/build/Dockerfile @@ -1,8 +1,12 @@ -FROM envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a +FROM envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ +RUN curl -sL https://packages.cloud.google.com/apt/doc/apt-key.gpg \ + | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \ + && curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc \ + | apt-key add - \ + && apt-get update \ && apt-get install --no-install-recommends -y -qq gosu \ && groupadd -f envoygroup \ && useradd -g envoygroup -m -d /home/envoybuild envoybuild diff --git a/mobile/third_party/rbe_configs/config/BUILD b/mobile/third_party/rbe_configs/config/BUILD index 5e3ca512b4a7..ad1323e6681c 100644 --- a/mobile/third_party/rbe_configs/config/BUILD +++ b/mobile/third_party/rbe_configs/config/BUILD @@ -43,8 +43,8 @@ platform( ], exec_properties = { # Please update both the commented tag and the sha256 - # 7304f974de2724617b7492ccb4c9c58cd420353a - "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:c219e5cf82f0058c12a801cfc9b680f10ddc480b99bedb099fb43f55d333f7ca", + # b0ff77ae3f25b0bf595f9b8bba46b489723ab446 + "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:6996521022f9dcd3fcf88ca3d44256f6c98712896e50815a79360791e0a174e6", "OSFamily": "Linux", "Pool": "linux", }, @@ -60,8 +60,8 @@ platform( ], exec_properties = { # Please update both the commented tag and the sha256 - # 7304f974de2724617b7492ccb4c9c58cd420353a - "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:c219e5cf82f0058c12a801cfc9b680f10ddc480b99bedb099fb43f55d333f7ca", + # b0ff77ae3f25b0bf595f9b8bba46b489723ab446 + "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:6996521022f9dcd3fcf88ca3d44256f6c98712896e50815a79360791e0a174e6", "OSFamily": "Linux", "Pool": "linux", # Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the