From 61759c073f5a2f649cb7a1808f9cad8c95fdb959 Mon Sep 17 00:00:00 2001 From: datadog-bits <263423550+datadog-bits@users.noreply.github.com> Date: Tue, 29 Sep 2026 15:43:00 +0000 Subject: [PATCH 1/3] Fix crane install in GHCR CI job Co-authored-by: pawelchcki --- .gitlab/devcontainer-to-ghcr.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab/devcontainer-to-ghcr.yml b/.gitlab/devcontainer-to-ghcr.yml index de966c0..ec3197f 100644 --- a/.gitlab/devcontainer-to-ghcr.yml +++ b/.gitlab/devcontainer-to-ghcr.yml @@ -32,11 +32,14 @@ devcontainer_to_ghcr: before_script: - | crane_archive=/tmp/go-containerregistry_Linux_x86_64.tar.gz + crane_bin_dir="$CI_PROJECT_DIR/.ci-bin" curl -fsSL \ "https://github.com/google/go-containerregistry/releases/download/${CRANE_VERSION}/go-containerregistry_Linux_x86_64.tar.gz" \ -o "$crane_archive" printf '%s %s\n' "$CRANE_LINUX_X86_64_SHA256" "$crane_archive" | sha256sum -c - - tar -xzf "$crane_archive" -C /usr/local/bin crane + mkdir -p "$crane_bin_dir" + tar -xzf "$crane_archive" -C "$crane_bin_dir" crane + export PATH="$crane_bin_dir:$PATH" crane version - | umask 077 @@ -80,7 +83,7 @@ devcontainer_to_ghcr: test "$(crane digest "$stable_ref")" = "$published_digest" echo "Published $stable_ref@$published_digest" after_script: - - crane auth logout ghcr.io || true + - '"$CI_PROJECT_DIR/.ci-bin/crane" auth logout ghcr.io || true' - | if [ -z "${GHCR_TOKEN:-}" ] && [ -s "$DEVCONTAINER_GHCR_TOKEN_FILE" ]; then dd-octo-sts revoke --token "$(cat "$DEVCONTAINER_GHCR_TOKEN_FILE")" \ From de0c40dbd67d3930ff98db09cecbee90785c43e4 Mon Sep 17 00:00:00 2001 From: datadog-bits <263423550+datadog-bits@users.noreply.github.com> Date: Tue, 29 Sep 2026 18:09:52 +0000 Subject: [PATCH 2/3] Add temporary crane CI validation Co-authored-by: pawelchcki --- .gitlab/devcontainer-to-ghcr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab/devcontainer-to-ghcr.yml b/.gitlab/devcontainer-to-ghcr.yml index ec3197f..630b0ee 100644 --- a/.gitlab/devcontainer-to-ghcr.yml +++ b/.gitlab/devcontainer-to-ghcr.yml @@ -27,6 +27,7 @@ devcontainer_to_ghcr: CRANE_VERSION: v0.20.3 CRANE_LINUX_X86_64_SHA256: 36c67a932f489b3f2724b64af90b599a8ef2aa7b004872597373c0ad694dc059 rules: + - if: '$CI_COMMIT_BRANCH == "dd/fix/devcontainer-ghcr-crane-permissions"' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' - when: never before_script: @@ -41,6 +42,10 @@ devcontainer_to_ghcr: tar -xzf "$crane_archive" -C "$crane_bin_dir" crane export PATH="$crane_bin_dir:$PATH" crane version + if [ "$CI_COMMIT_BRANCH" = "dd/fix/devcontainer-ghcr-crane-permissions" ]; then + echo "Crane install verified on PR branch" + exit 0 + fi - | umask 077 if [ -n "${GHCR_TOKEN:-}" ]; then From e12f1f27686b730bbd793eadb57ef03de426a904 Mon Sep 17 00:00:00 2001 From: datadog-bits <263423550+datadog-bits@users.noreply.github.com> Date: Tue, 29 Sep 2026 20:29:50 +0000 Subject: [PATCH 3/3] Revert "Add temporary crane CI validation" This reverts commit de0c40dbd67d3930ff98db09cecbee90785c43e4. Co-authored-by: pawelchcki --- .gitlab/devcontainer-to-ghcr.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab/devcontainer-to-ghcr.yml b/.gitlab/devcontainer-to-ghcr.yml index 630b0ee..ec3197f 100644 --- a/.gitlab/devcontainer-to-ghcr.yml +++ b/.gitlab/devcontainer-to-ghcr.yml @@ -27,7 +27,6 @@ devcontainer_to_ghcr: CRANE_VERSION: v0.20.3 CRANE_LINUX_X86_64_SHA256: 36c67a932f489b3f2724b64af90b599a8ef2aa7b004872597373c0ad694dc059 rules: - - if: '$CI_COMMIT_BRANCH == "dd/fix/devcontainer-ghcr-crane-permissions"' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' - when: never before_script: @@ -42,10 +41,6 @@ devcontainer_to_ghcr: tar -xzf "$crane_archive" -C "$crane_bin_dir" crane export PATH="$crane_bin_dir:$PATH" crane version - if [ "$CI_COMMIT_BRANCH" = "dd/fix/devcontainer-ghcr-crane-permissions" ]; then - echo "Crane install verified on PR branch" - exit 0 - fi - | umask 077 if [ -n "${GHCR_TOKEN:-}" ]; then