Merge pull request #536 from rancher/gha-portpr-10169370218-1

[backport release/v3.0] Fix package script bug
rancher · Jul 30, 2024 · eedea03 · eedea03
2 parents e59b40d + 29713be
commit eedea03
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -18,7 +18,7 @@ RUN if [ "${ARCH}" != "s390x" ]; then \
     fi
 
 
-ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS CROSS_ARCH USE_DOCKER_BUILDX
+ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS CROSS_ARCH USE_DOCKER_BUILDX TARGET_ARCH
 ENV DAPPER_SOURCE /go/src/github.com/rancher/backup-restore-operator/
 ENV DAPPER_OUTPUT ./bin ./dist
 ENV GOCACHE /root/.cache/go-build

diff --git a/scripts/package b/scripts/package
@@ -18,8 +18,8 @@ if [[ ${USE_DOCKER_BUILDX} -eq 1 ]]; then
 else
     docker build -f ${DOCKERFILE} -t ${IMAGE} .
 fi
-echo Built ${IMAGE}
 
-docker image save rancher/backup-restore-operator:$TAG -o ./dist/artifacts/backup-restore-operator.img
+echo Built ${IMAGE}
+docker image save ${IMAGE} -o ./dist/artifacts/backup-restore-operator.img
 
 ./scripts/package-helm
diff --git a/scripts/version b/scripts/version
@@ -14,6 +14,7 @@ else
     VERSION="${COMMIT}${DIRTY}"
 fi
 
+ARCH=$TARGET_ARCH
 if [ -z "$ARCH" ]; then
     ARCH=$(go env GOHOSTARCH)
 fi