fix(ci): preserve buildx builder with Harbor auth

This commit is contained in:
Jason A
2026-09-30 07:32:50 -04:00
parent 944a5f90ad
commit db8c77281a
+15 -12
View File
@@ -15,6 +15,21 @@ registry=${HARBOR_REGISTRY:-registry.aeternalisgames.com}
project=${HARBOR_PROJECT:-aeternalis}
cache_ref="${registry}/${project}/${cache_repository}:${CACHE_TAG:-main}-${target}"
# PRs may not receive registry credentials. Main and trusted runs do.
if [[ -n "${HARBOR_USERNAME:-}" && -n "${HARBOR_PASSWORD:-}" ]]; then
export DOCKER_CONFIG
DOCKER_CONFIG="$(mktemp -d "${RUNNER_TEMP:-/tmp}/aevolution-buildx-docker.XXXXXX")"
trap 'rm -rf -- "$DOCKER_CONFIG"' EXIT
printf '%s' "$HARBOR_PASSWORD" | docker login "$registry" \
--username "$HARBOR_USERNAME" --password-stdin >/dev/null
cache_from=(--cache-from "type=registry,ref=${cache_ref}")
else
cache_from=()
fi
# Registry cache export requires a docker-container (or containerd) builder.
# Select/create it after DOCKER_CONFIG is set so Buildx sees the same builder
# metadata and registry credentials as the build command.
builder=${BUILDX_BUILDER:-aevolution-registry}
driver=$(docker buildx inspect "$builder" 2>/dev/null | awk -F': ' '/^Driver:/{print $2; exit}' || true)
if [[ "$driver" == docker-container ]]; then
@@ -30,18 +45,6 @@ else
docker buildx create --name "$builder" --driver docker-container --use
fi
# PRs may not receive registry credentials. Main and trusted runs do.
if [[ -n "${HARBOR_USERNAME:-}" && -n "${HARBOR_PASSWORD:-}" ]]; then
export DOCKER_CONFIG
DOCKER_CONFIG="$(mktemp -d "${RUNNER_TEMP:-/tmp}/aevolution-buildx-docker.XXXXXX")"
trap 'rm -rf -- "$DOCKER_CONFIG"' EXIT
printf '%s' "$HARBOR_PASSWORD" | docker login "$registry" \
--username "$HARBOR_USERNAME" --password-stdin >/dev/null
cache_from=(--cache-from "type=registry,ref=${cache_ref}")
else
cache_from=()
fi
cache_to=()
if [[ "${CACHE_WRITE:-0}" == 1 ]]; then
cache_to=(--cache-to "type=registry,ref=${cache_ref},mode=max")