chore(ci): make regression/Dockerfile self-contained#25411
Draft
pront wants to merge 4 commits into
Draft
Conversation
Switches the regression builder stage from timberio/vector-dev:latest to rust:1-slim-trixie with inline apt + protoc setup, mirroring tests/e2e/Dockerfile. This removes the dependency on the published dev environment image so the SMP regression detector no longer relies on a separately maintained CI artifact. The target stage is unchanged. apt deps mirror what scripts/environment installs for a Vector build (build-essential, libsasl2-dev, libssl-dev, libxxhash-dev, libclang-dev, zlib1g-dev, etc.). The rust toolchain is selected by rust-toolchain.toml via scripts/environment/prepare.sh. Note for regression baselines: the build environment changes once with this PR, so the next comparison may show a one-time baseline shift that will normalize after master picks up the new Dockerfile. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
prepare.sh has a recent breaking change (the release-flags.sh sourcing was removed in commit 17a720c on 2026-05-07), and the regression detector's baseline build copies the baseline checkout's source tree — which still has the old prepare.sh that fails when release-flags.sh is absent. Replaces \`bash /prepare.sh --modules=rustup\` with \`cargo --version\`, which triggers rustup's auto-install of the toolchain pinned in rust-toolchain.toml. The Dockerfile now depends only on install-protoc.sh from scripts/environment. Verified locally that the toolchain install + protoc + Vector compile all work; build OOMs at final link on Apple Silicon Docker Desktop (8GB cap) but proceeds past Vector lib compile. CI runners (ubuntu-24.04, 16GB) handle the link fine, as the existing regression workflow already demonstrates. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Reverts the cargo --version shortcut and restores prepare.sh as the
single source of truth for toolchain setup, matching the pattern used
in tests/e2e/Dockerfile.
Copies the whole scripts/environment/ tree (instead of individual
files) so prepare.sh can source its sibling scripts. This is what
fixes the original baseline build failure: older checkouts have a
prepare.sh that sources release-flags.sh from \${SCRIPT_DIR}, and
with the directory layout preserved that file is found alongside
prepare.sh.
Verified locally against both:
- current master (no release-flags.sh, new prepare.sh)
- baseline-equivalent snapshot (old prepare.sh + release-flags.sh)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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.
Summary
Switches the regression detector's builder stage from
timberio/vector-dev:latesttorust:1-slim-trixiewith inline apt + protoc setup, mirroringtests/e2e/Dockerfile.This removes the SMP regression detector's dependency on the published dev environment image — second of three PRs to retire
timberio/vector-dev. After this lands, onlymake environmentitself still references the image; that machinery + the publishing workflow will go in the final PR.The target stage is unchanged. apt deps mirror what
scripts/environment/bootstrap-ubuntu-24.04.shinstalls for a Vector build (build-essential,libsasl2-dev,libssl-dev,libxxhash-dev,libclang-dev,zlib1g-dev, etc.). The Rust toolchain is selected byrust-toolchain.tomlviascripts/environment/prepare.sh --modules=rustup.Note on baselines
The build environment changes once with this PR, so the first comparison after merge may show a one-time baseline shift. Expected — both binaries in subsequent comparisons will use the same Dockerfile.
Vector configuration
N/A — internal CI change.
How did you test this PR?
Local Docker isn't available, so I couldn't build the image locally. Validation comes from:
/ci-run-regressionreview trigger (see below)RUN ["/usr/bin/vector", "--version"]in the target stageChange Type
Is this a breaking change?
Does this PR include user facing changes?
no-changeloglabel to this PR.References
N/A