From ac09a00de785b97bc99b304c4663de6b6caa8e03 Mon Sep 17 00:00:00 2001 From: Brad Davidson <brad.davidson@rancher.com> Date: Wed, 25 Sep 2024 21:52:59 +0000 Subject: [PATCH] Fix image tag Workflow is triggered on tag, not release, so we can't use release.tag_name. Also, need to use TARGETARCH instead of ARCH for multiplatform builds. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> --- .github/workflows/release.yaml | 3 ++- package/Dockerfile | 8 ++++---- scripts/package-controller | 8 ++------ scripts/package-e2e-tests | 8 ++------ 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fe1b7ef0..a4586cdc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -135,6 +135,7 @@ jobs: with: context: . push: true - tags: rancher/system-upgrade-controller:${{ github.event.release.tag_name }} + tags: rancher/system-upgrade-controller:${{ env.TAG }} file: package/Dockerfile + target: controller platforms: linux/amd64, linux/arm64 diff --git a/package/Dockerfile b/package/Dockerfile index a4ab45a3..80f00710 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -6,12 +6,12 @@ ENV GOBIN=/bin RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.20.0 FROM ${BCI} AS e2e-tests -ARG ARCH +ARG TARGETARCH ARG REPO=rancher ARG TAG ENV SYSTEM_UPGRADE_CONTROLLER_IMAGE=${REPO}/system-upgrade-controller:${TAG} COPY --from=e2e-ginkgo /bin/ginkgo /bin/ginkgo -COPY dist/artifacts/system-upgrade-controller.test-${ARCH} /bin/system-upgrade-controller.test +COPY dist/artifacts/system-upgrade-controller.test-${TARGETARCH} /bin/system-upgrade-controller.test COPY e2e/plugin/run.sh /run.sh RUN set -x \ && chmod +x /run.sh @@ -20,7 +20,7 @@ RUN set -x \ ENTRYPOINT ["/run.sh"] FROM scratch AS controller -ARG ARCH -COPY dist/artifacts/system-upgrade-controller-${ARCH} /bin/system-upgrade-controller +ARG TARGETARCH +COPY dist/artifacts/system-upgrade-controller-${TARGETARCH} /bin/system-upgrade-controller USER 65534:65534 ENTRYPOINT ["/bin/system-upgrade-controller"] diff --git a/scripts/package-controller b/scripts/package-controller index 7536cff6..42ce638d 100755 --- a/scripts/package-controller +++ b/scripts/package-controller @@ -5,12 +5,8 @@ source $(dirname $0)/version cd $(dirname $0)/.. -if [ "$ARCH" != "arm" ]; then - export DOCKER_BUILDKIT=1 -fi - -docker build \ - --build-arg ARCH=${ARCH} \ +docker buildx build \ + --build-arg TARGETARCH=${ARCH} \ --build-arg REPO=${REPO} \ --build-arg TAG=${TAG} \ --build-arg VERSION=${VERSION} \ diff --git a/scripts/package-e2e-tests b/scripts/package-e2e-tests index 6d1f2e09..2dc3142c 100755 --- a/scripts/package-e2e-tests +++ b/scripts/package-e2e-tests @@ -5,12 +5,8 @@ source $(dirname $0)/version cd $(dirname $0)/.. -if [ "$ARCH" != "arm" ]; then - export DOCKER_BUILDKIT=1 -fi - -docker build \ - --build-arg ARCH=${ARCH} \ +docker buildx build \ + --build-arg TARGETARCH=${ARCH} \ --build-arg REPO=${REPO} \ --build-arg TAG=${TAG} \ --build-arg VERSION=${VERSION} \ -- GitLab