Adds multi-arch build support (#3761)

Enables ARM64 builds with dynamic image selection to enhance compatibility and streamline deployment workflows

Author: Twsouza

Makefile

@@ -22,6 +22,7 @@ build: $(binaries) $(statics)
 
 builder:
 	docker buildx build --platform linux/amd64 -t convox/build:$(VERSION) --no-cache --pull --push -f cmd/build/Dockerfile .
+	docker buildx build --platform linux/arm64 -t convox/build:$(VERSION)-arm64 --no-cache --pull --push -f cmd/build/Dockerfile.arm .
 
 clean: clean-package
 	make -C cmd/convox clean
@@ -103,7 +104,7 @@ test-docker:
 	docker run -it convox/rack:test make test
 
 $(binaries): $(GOPATH)/bin/%: $(sources)
-	env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -tags=hidraw -ldflags="-extldflags=-static" -o $@ ./cmd/$*
+	env CGO_ENABLED=0 GOOS=linux go build -mod=vendor -tags=hidraw -ldflags="-extldflags=-static" -o $@ ./cmd/$*
 
 $(statics): $(GOPATH)/bin/%: $(sources)
 	env CGO_ENABLED=0 go install --ldflags '-extldflags "-static" -s -w' ./cmd/$*

cmd/build/Dockerfile.arm

@@ -0,0 +1,40 @@
+FROM golang:1.23-bookworm AS package
+
+ARG DOCKER_ARCH=aarch64
+ENV PATH=$PATH:/go/bin
+
+# Add backports to get upx-ucl in Bookworm
+RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \
+    apt-get update && apt-get install -y -t bookworm-backports upx-ucl
+
+WORKDIR /go/src/github.com/convox/rack
+
+COPY . /go/src/github.com/convox/rack
+RUN make build compress
+
+# add crane (single static binary)
+ENV VERSION=v0.20.3
+ENV OS=Linux
+ENV ARCH=arm64
+ARG DOCKER_ARCH=aarch64
+
+RUN curl -sL "https://github.com/google/go-containerregistry/releases/download/${VERSION}/go-containerregistry_${OS}_${ARCH}.tar.gz" > go-containerregistry.tar.gz && \
+    mkdir -p /usr/local/bin/crane && \
+    tar -zxvf go-containerregistry.tar.gz -C /usr/local/bin/ crane && \
+    rm go-containerregistry.tar.gz
+
+# Kaniko runtime
+FROM gcr.io/kaniko-project/executor:v1.23.2-debug
+
+# Create /tmp so Kaniko can write
+RUN mkdir -p /tmp && chmod 1777 /tmp
+
+# Copy crane
+COPY --from=package /usr/local/bin/crane /busybox
+
+# Copy the build output
+COPY --from=package /go/bin/build /busybox/
+COPY --from=package /go/bin/convox-env /busybox/
+
+ENTRYPOINT []
+CMD ["/busybox/build"]

provider/aws/formation/rack.json

@@ -39,6 +39,12 @@
       {"Condition": "PrivateAndThirdAvailabilityZoneAndHighAvailability"}
     ]},
     "DedicatedBuilder": { "Fn::Not": [ { "Fn::Equals": [ { "Ref": "BuildInstance" }, "" ] } ] },
+    "DedicatedBuilderAS": {
+      "Fn::And": [
+        { "Condition": "DedicatedBuilder" },
+        { "Fn::Not": [ { "Condition": "UseFargateBuild" } ] }
+      ]
+    },
     "Development": { "Fn::Equals": [ { "Ref": "Development" }, "Yes" ] },
     "EnableALBPort80": {
       "Fn::And": [ { "Condition": "PublicRouter" }, { "Condition": "AllowALBPort80" } ]
@@ -295,7 +301,7 @@
       "Value": { "Ref": "AWS::Region" }
     },
     "BuildAutoscalingGroup": {
-      "Value": { "Fn::If": [ "DedicatedBuilder", { "Ref": "BuildInstances" }, { "Ref": "Instances" } ] }
+      "Value": { "Fn::If": [ "DedicatedBuilderAS", { "Ref": "BuildInstances" }, { "Ref": "Instances" } ] }
     },
     "BuildCluster": {
       "Value": { "Fn::If": [ "DedicatedBuilder", { "Ref": "BuildCluster" }, { "Ref": "Cluster" } ] }
@@ -2007,7 +2013,7 @@
       }
     },
     "BuildInstances": {
-      "Condition": "DedicatedBuilder",
+      "Condition": "DedicatedBuilderAS",
       "Type": "AWS::AutoScaling::AutoScalingGroup",
       "Properties" : {
         "LaunchTemplate" : {
@@ -4227,7 +4233,19 @@
               { "Name": "STACK_ID", "Value": { "Ref": "AWS::StackId" } },
               { "Name": "BUILD_RUNTIME", "Value": "daemonless" }
             ],
-            "Image": { "Fn::Sub": "convox/build:${Version}" },
+            "Image": {
+              "Fn::If": [
+                "BlankBuildImage",
+                {
+                  "Fn::If": [
+                    "InstanceARM",
+                    { "Fn::Sub": "convox/build:${Version}-arm64" },
+                    { "Fn::Sub": "convox/build:${Version}" }
+                  ]
+                },
+                { "Ref": "BuildImage" }
+              ]
+            },
             "LogConfiguration": {
               "Fn::If": [
                 "EnableSyslog",
@@ -4264,6 +4282,15 @@
             }]
           }
         ],
+        "RuntimePlatform": {
+          "CpuArchitecture" : {
+            "Fn::If": [
+              "InstanceARM",
+              "ARM64",
+              "X86_64"
+            ]
+          }
+        },
         "ExecutionRoleArn": { "Fn::GetAtt": [ "ApiRole", "Arn" ] },
         "Family": { "Fn::Sub": "${AWS::StackName}-build" },
         "TaskRoleArn": { "Fn::GetAtt": [ "ApiRole", "Arn" ] }