Update Envoy build-image docs and Docker Hub role for toolshed envoy-build variants#44937
Draft
Copilot wants to merge 4 commits into
Draft
Update Envoy build-image docs and Docker Hub role for toolshed envoy-build variants#44937Copilot wants to merge 4 commits into
envoy-build variants#44937Copilot wants to merge 4 commits into
Conversation
Agent-Logs-Url: https://github.com/envoyproxy/envoy/sessions/f994294c-b8aa-4a65-a1ff-40547f0fe2c4 Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Agent-Logs-Url: https://github.com/envoyproxy/envoy/sessions/f994294c-b8aa-4a65-a1ff-40547f0fe2c4 Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Agent-Logs-Url: https://github.com/envoyproxy/envoy/sessions/f994294c-b8aa-4a65-a1ff-40547f0fe2c4 Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update Docker image tags for build tools
Update Envoy build-image docs and Docker Hub role for toolshed May 8, 2026
envoy-build variants
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Envoy docs and helper code still referenced the retired
envoy-build-ubuntu/envoy-build-toolssetup. This PR updates references to the current toolshed-managedenvoyproxy/envoy-buildmodel with variant-prefixed tags and clarifies variant-specific image size expectations.CI docs (
ci/README.md)envoy-build-ubuntuandenvoy-build-toolsreferences with:envoyproxy/envoy-build:ci-<tag>envoyproxy/toolshed/docker/buildENVOY_BUILD_IMAGEdocs toenvoyproxy/envoy-build(civariant) and refreshed example commands todocker.io/envoyproxy/envoy-build:ci-<tag>.Install docs (
docs/root/start/install.rst)envoyproxy/envoy-build.build=>ci,build-mobile).ci/gcc/mobilelarge;worker/devtools/docker/testsmaller).Local Docker build docs (
docs/root/start/building/local_docker_build.rst)ci-.Sphinx Docker Hub role (
docs/conf.py)dockerhub_envoybuild-image mapping to generateenvoyproxy/envoy-build:<variant>-<build_sha>links.:dockerhub_envoy:\build`asci`.build-ubuntu*inputs by translating them to new variants.Example of the role behavior after this change:
Original prompt
Background
Envoy CI's prebuilt Docker build images used to live in
envoyproxy/envoy-build-toolsand were Ubuntu-based (image name:
envoyproxy/envoy-build-ubuntu).They are now built in
envoyproxy/toolshed,are Debian-based, and use a single image repository
envoyproxy/envoy-buildwith variant-prefixed tags (semver-based, see
docker/build/VERSION.txt— currently0.1.1-dev):cienvoyproxy/envoy-build:ci-<ver>envoy-build-ubuntu). Contains LLVM/clang — large image.gccenvoyproxy/envoy-build:gcc-<ver>mobileenvoyproxy/envoy-build:mobile-<ver>envoy-build-ubuntu:mobile). amd64 only. Large.workerenvoyproxy/envoy-build:worker-<ver>devtoolsenvoyproxy/envoy-build:devtools-<ver>dockerenvoyproxy/envoy-build:docker-<ver>testenvoyproxy/envoy-build:test-<ver>The variants/tag scheme are confirmed by
docker/build/linux/debian_build.shand used by the build-image SHA workflow already in this repo (
.github/workflows/envoy-dependency.yml,update-build-imagejob, which referencesdocker.io/envoyproxy/envoy-build:ci-<tag>,:devtools-<tag>,:docker-<tag>,:gcc-<tag>,:mobile-<tag>,:worker-<tag>).A few docs and code comments in
envoyproxy/envoywere not updated when this migration happened.Task
Update all stale references to
envoy-build-ubuntuandenvoyproxy/envoy-build-toolsso theypoint at the new
envoy-buildimage and atenvoyproxy/toolshed. Also adjust disk-space warnings:the new image is only large for variants that still bundle LLVM (
ci,gcc,mobile); forother variants (
worker,devtools,docker,test) the image is small. Since the defaultbuild variant (
ci) still bundles LLVM, the existing 4-5GB warning is still appropriate for thedefault user-facing build flow — but rewording is required (see below).
Files to change
1.
ci/README.md(e.g. "Linux build image"). Update the image name to
envoyproxy/envoy-build:ci-<hash>,fix the Docker Hub link, and update the link that points developers at
envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8so it pointsto the equivalent location in
envoyproxy/toolshed— the build images are now sourced fromenvoyproxy/toolshed/docker/build.Replace the bullet
* envoyproxy/envoy-build-ubuntu — based on Ubuntu 20.04 (Focal) with GCC 13 and Clang 18 compiler.with the equivalent for the current Debian image. Look up the actual base and toolchain versions
from
docker/build/linux/debian/Dockerfileand
fun.shin toolshed (likely Debian + currently shipped Clang/GCC versions). Also update the source-of-truth
link from
envoyproxy/envoy-build-toolstoenvoyproxy/toolshed. Fix the typo "theis" → "these".ENVOY_BUILD_IMAGEon Linux: changeenvoyproxy/envoy-build-ubuntu→envoyproxy/envoy-build(variantci).docker.io/envoyproxy/envoy-build:ci-<tag>(or document that
<tag>is now of the formci-<sha>/ci-<semver>).2.
docs/root/start/install.rst(around L228-L257, the_install_toolssection)envoyproxy/envoy-build-ubuntu(and the linkhttps://hub.docker.com/r/envoyproxy/envoy-build-ubuntu)with
envoyproxy/envoy-build(linkhttps://hub.docker.com/r/envoyproxy/envoy-build).envoy-build-ubuntu (default)andenvoy-build-ubuntu:mobile.Replace with the new variants. At minimum show:
envoy-build:ci(default — what users will pull when ...This pull request was created from Copilot chat.