rpm,deb: make build ARCH-aware

Signed-off-by: Bjorn Neergaard <[email protected]>
docker · Mar 15, 2024 · 95f4e2e · 95f4e2e
1 parent 635fcfa
commit 95f4e2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -46,10 +46,10 @@ def genBuildStep(LinkedHashMap pkg, String arch) {
             stage("build") {
                 checkout scm
                 sh "make clean"
-                sh "make REF=$branch ${pkg.target}"
+                sh "make REF=$branch ARCH=${arch} ${pkg.target}"
             }
             stage("verify") {
-                sh "make IMAGE=${pkg.image} verify"
+                sh "make IMAGE=${pkg.image} ARCH=${arch} verify"
             }
         }
     }

diff --git a/deb/Makefile b/deb/Makefile
@@ -22,12 +22,14 @@ BUILD?=DOCKER_BUILDKIT=1 \
 	--build-arg GO_IMAGE=$(GO_IMAGE) \
 	--build-arg COMMON_FILES=$(COMMON_FILES) \
 	-t debbuild-$@/$(ARCH) \
+	--platform linux/$(ARCH) \
 	-f $@/Dockerfile \
 	.
 
 # Additional flags may be necessary at some point
 RUN_FLAGS=
 RUN?=docker run --rm \
+	--platform linux/$(ARCH) \
 	-e PLATFORM \
 	-e EPOCH='$(EPOCH)' \
 	-e DEB_VERSION=$(word 1, $(GEN_DEB_VER)) \

diff --git a/rpm/Makefile b/rpm/Makefile
@@ -18,6 +18,7 @@ BUILD?=DOCKER_BUILDKIT=1 \
 	$(BUILD_IMAGE_FLAG) \
 	--build-arg GO_IMAGE=$(GO_IMAGE) \
 	-t rpmbuild-$@/$(ARCH) \
+	--platform linux/$(ARCH) \
 	-f $@/Dockerfile \
 	.
 
@@ -42,6 +43,7 @@ RPMBUILD_FLAGS?=-ba\
 # Additional flags may be necessary at some point
 RUN_FLAGS=
 RUN?=docker run --rm \
+	--platform linux/$(ARCH) \
 	-e PLATFORM \
 	-v $(CURDIR)/rpmbuild/SOURCES:/root/rpmbuild/SOURCES:ro \
 	-v $(CURDIR)/rpmbuild/$@/RPMS:/root/rpmbuild/RPMS \