Use the same docker image for x86 and arm builds of desktop

fleetdm · Jun 24, 2024 · 13218ad · 13218ad
1 parent 69aa510
commit 13218ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/Dockerfile-desktop-linux-arm64 b/Dockerfile-desktop-linux-arm64
diff --git a/Makefile b/Makefile
@@ -472,10 +472,10 @@ desktop-linux:
 #
 # Output: desktop.tar.gz
 desktop-linux-arm64:
-	docker build -f Dockerfile-desktop-linux-arm64 -t desktop-linux-builder-arm64 .
-	docker run --rm -v $(shell pwd):/output desktop-linux-builder-arm64 /bin/bash -c "\
+	docker build -f Dockerfile-desktop-linux -t desktop-linux-builder .
+	docker run --rm -v $(shell pwd):/output desktop-linux-builder /bin/bash -c "\
 		mkdir /output/fleet-desktop && \
-		go build -o /output/fleet-desktop/fleet-desktop -ldflags "-X=main.version=$(FLEET_DESKTOP_VERSION)" /usr/src/fleet/orbit/cmd/desktop && \
+		GOARCH=arm64 go build -o /output/fleet-desktop/fleet-desktop -ldflags "-X=main.version=$(FLEET_DESKTOP_VERSION)" /usr/src/fleet/orbit/cmd/desktop && \
 		cd /output && \
 		tar czf desktop.tar.gz fleet-desktop && \
 		rm -r fleet-desktop"