-
Notifications
You must be signed in to change notification settings - Fork 3.1k
fix(e2e): run Docker Hub auth from an immutable pinned action #7079
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
467eef7
refactor(e2e): route Docker Hub auth through a trusted setup script
laitingsheng 567154c
Merge remote-tracking branch 'origin/main' into refactor/e2e-docker-a…
laitingsheng 1154142
fix(e2e): withhold Docker Hub credentials from alternate checkouts
laitingsheng 48b8ba8
Merge remote-tracking branch 'origin/main' into refactor/e2e-docker-a…
laitingsheng 78091da
ci(e2e): add pinned docker-auth-setup composite action
laitingsheng 2517344
fix(e2e): invoke Docker Hub auth from an immutable pinned action
laitingsheng 7691eb4
Merge remote-tracking branch 'origin/main' into refactor/e2e-docker-a…
laitingsheng 3306a58
fix(e2e): bind Docker auth action provenance
apurvvkumaria 01e4cf0
test(e2e): keep Docker auth boundary linear
apurvvkumaria da7ad13
test(e2e): tag Docker auth boundary coverage
apurvvkumaria 296b34d
ci(e2e): add pinned host-dependency setup action
laitingsheng f94c78f
refactor(e2e): install host dependencies from a pinned action
laitingsheng 4def150
fix(e2e): reject non-space-separated host dependency package input
laitingsheng 666e08a
fix(e2e): fail closed on host dependency continue-on-error and re-pin…
laitingsheng 7050aff
Merge branch 'main' into refactor/e2e-docker-auth-setup-helper
cv 93d3f10
test(e2e): exercise host dependency helper
cv 56373b0
merge(main): refresh PR 7079
cv 892f2e1
Merge remote-tracking branch 'origin/main' into codex/salvage-7079-ho…
cv a032ad9
test(e2e): cover host helper argument guard
cv 5409133
merge: refresh PR #7079 from main
cv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| name: docker-auth-setup | ||
| description: Authenticate to Docker Hub from an isolated per-job Docker config, fail closed. | ||
|
|
||
| inputs: | ||
| auth-required: | ||
| description: Whether trusted Docker Hub credentials are present for this run. | ||
| required: true | ||
| username: | ||
| description: Docker Hub username; only populated for trusted runs. | ||
| required: false | ||
| default: "" | ||
| token: | ||
| description: Docker Hub token; only populated for trusted runs. | ||
| required: false | ||
| default: "" | ||
|
|
||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Authenticate to Docker Hub | ||
| shell: bash | ||
| env: | ||
| DOCKERHUB_AUTH_REQUIRED: ${{ inputs.auth-required }} | ||
| DOCKERHUB_USERNAME: ${{ inputs.username }} | ||
| DOCKERHUB_TOKEN: ${{ inputs.token }} | ||
| run: bash "${{ github.action_path }}/../../scripts/docker-auth-setup.sh" |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| name: host-dependency-setup | ||
| description: Install reviewed apt host dependencies with bounded retries from a trusted pinned action. | ||
|
|
||
| inputs: | ||
| packages: | ||
| description: Space-separated apt packages from the reviewed allowlist (expect, iptables). | ||
| required: true | ||
|
|
||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Install host dependencies | ||
| shell: bash | ||
| env: | ||
| HOST_DEPENDENCY_PACKAGES: ${{ inputs.packages }} | ||
| run: bash "${{ github.action_path }}/../../scripts/host-dependency-setup.sh" |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #!/usr/bin/env bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| if (($# != 0)); then | ||
| echo "::error::Docker auth setup does not accept arguments." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| docker_config="$(mktemp -d "${RUNNER_TEMP}/docker-config-${GITHUB_JOB}-XXXXXX")" | ||
| chmod 700 "${docker_config}" | ||
| export DOCKER_CONFIG="${docker_config}" | ||
| printf 'DOCKER_CONFIG=%s\n' "${DOCKER_CONFIG}" >>"${GITHUB_ENV}" | ||
|
|
||
| if [[ "${DOCKERHUB_AUTH_REQUIRED}" != "1" ]]; then | ||
| echo "::notice::Docker Hub credentials are withheld for this ref; continuing with anonymous pulls." | ||
| exit 0 | ||
| fi | ||
| if [[ -z "${DOCKERHUB_USERNAME}" || -z "${DOCKERHUB_TOKEN}" ]]; then | ||
| echo "::error::Docker Hub credentials are required for trusted E2E runs." | ||
| exit 1 | ||
| fi | ||
|
|
||
| auth_marker="${DOCKER_CONFIG}/.nemoclaw-docker-login-attempted" | ||
| : >"${auth_marker}" | ||
| chmod 600 "${auth_marker}" | ||
| login_succeeded=0 | ||
| for attempt in 1 2 3; do | ||
| if printf '%s' "${DOCKERHUB_TOKEN}" | timeout 30s docker login docker.io --username "${DOCKERHUB_USERNAME}" --password-stdin; then | ||
| login_succeeded=1 | ||
| break | ||
| fi | ||
| if [[ "${attempt}" -lt 3 ]]; then | ||
| echo "::warning::Docker Hub login attempt ${attempt} failed; retrying." | ||
| sleep 5 | ||
| fi | ||
| done | ||
| if [[ "${login_succeeded}" -ne 1 ]]; then | ||
| echo "::error::Docker Hub login failed after 3 attempts." | ||
| exit 1 | ||
| fi |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #!/usr/bin/env bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| if (($# != 0)); then | ||
| echo "::error::Host dependency setup does not accept arguments." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [[ -z "${HOST_DEPENDENCY_PACKAGES:-}" ]]; then | ||
| echo "::error::Host dependency setup requires at least one package." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [[ "${HOST_DEPENDENCY_PACKAGES}" == *[$'\t\r\n']* ]]; then | ||
| echo "::error::Host dependency packages must be space-separated on one line." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| read -r -a requested_packages <<<"${HOST_DEPENDENCY_PACKAGES}" | ||
| if ((${#requested_packages[@]} == 0)); then | ||
| echo "::error::Host dependency setup requires at least one package." >&2 | ||
| exit 1 | ||
| fi | ||
| allowlist=" expect iptables " | ||
| for package in "${requested_packages[@]}"; do | ||
| if [[ "${allowlist}" != *" ${package} "* ]]; then | ||
| echo "::error::Host dependency package '${package}' is outside the reviewed allowlist." >&2 | ||
| exit 1 | ||
| fi | ||
| done | ||
|
|
||
| for attempt in 1 2 3; do | ||
| if sudo apt-get update; then | ||
| break | ||
| fi | ||
| if [[ "${attempt}" -eq 3 ]]; then | ||
| echo "::error::apt-get update failed after 3 attempts." >&2 | ||
| exit 1 | ||
| fi | ||
| echo "::warning::apt-get update attempt ${attempt} failed; retrying." >&2 | ||
| sleep $((attempt * 5)) | ||
| done | ||
| sudo apt-get install -y --no-install-recommends "${requested_packages[@]}" | ||
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.