From ba390fd905a8b146ca724f6f98ed9bc17862b600 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Mon, 22 Jan 2024 14:00:59 +0100 Subject: [PATCH] test: adjust capd dockerfile so the binary exposes the package in the built binraries path variable --- hack/docker-image-verify.sh | 2 +- test/infrastructure/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/docker-image-verify.sh b/hack/docker-image-verify.sh index 697a89bac589..e9210fdd5c03 100755 --- a/hack/docker-image-verify.sh +++ b/hack/docker-image-verify.sh @@ -51,7 +51,7 @@ for arch in ${ALL_ARCH}; do TESTIMAGE "${REGISTRY}/cluster-api-controller-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api$" TESTIMAGE "${REGISTRY}/kubeadm-bootstrap-controller-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api/bootstrap/kubeadm$" TESTIMAGE "${REGISTRY}/kubeadm-control-plane-controller-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api/controlplane/kubeadm$" - TESTIMAGE "${REGISTRY}/capd-manager-${arch}:${TAG}" "${arch}" "command-line-arguments$" + TESTIMAGE "${REGISTRY}/capd-manager-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api/test/infrastructure/docker$" TESTIMAGE "${REGISTRY}/capim-manager-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api/test/infrastructure/inmemory$" TESTIMAGE "${REGISTRY}/test-extension-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api/test/extension$" TESTIMAGE "${REGISTRY}/clusterctl-${arch}:${TAG}" "${arch}" "sigs.k8s.io/cluster-api/cmd/clusterctl$" "clusterctl" diff --git a/test/infrastructure/docker/Dockerfile b/test/infrastructure/docker/Dockerfile index baa683054f76..972f7f36eda3 100644 --- a/test/infrastructure/docker/Dockerfile +++ b/test/infrastructure/docker/Dockerfile @@ -63,7 +63,7 @@ ARG ARCH # Build the CAPD manager using the compiler cache folder RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -trimpath -a -o /workspace/manager main.go + CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -trimpath -a -o /workspace/manager . # NOTE: CAPD can't use non-root because docker requires access to the docker socket