Support multi-arch builds

.github/workflows/release.yaml

@@ -20,6 +20,12 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Cache
         uses: actions/cache@v4
         with:
@@ -28,9 +34,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
-      - name: Build container images
-        run: make container
-
       - name: Log into registry
         uses: docker/login-action@v3
         with:
@@ -41,22 +44,57 @@ jobs:
       - name: Push main
         if: github.ref == 'refs/heads/main'
         run: |
+          REV=$(git describe --long --tags --match='v*' --dirty 2>/dev/null || git rev-list -n1 HEAD)
+          GIT_COMMIT=$(git rev-parse HEAD)
+          BUILD_DATE=$(date -u -Iseconds)
+          PKG=github.com/cloudstack/cloudstack-csi-driver
+          LDFLAGS="-s -w -X ${PKG}/pkg/driver.driverVersion=${REV} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE}"
+
           for img in $IMAGES; do
-              docker tag ${img} ${REGISTRY_NAME}/${img}:main
-              docker push ${REGISTRY_NAME}/${img}:main
+              docker buildx build \
+                --platform linux/amd64,linux/arm64 \
+                --file ./cmd/${img}/Dockerfile \
+                --build-arg LDFLAGS="${LDFLAGS}" \
+                --tag ${REGISTRY_NAME}/${img}:main \
+                --label org.opencontainers.image.revision=${GIT_COMMIT} \
+                --push \
+                .
           done
 
       - name: Push tagged release
         if: startsWith(github.ref, 'refs/tags/v')
         run: |
           # Strip prefix from version
           VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,' | sed -e 's/^v//')
+          REV=$(git describe --long --tags --match='v*' --dirty 2>/dev/null || git rev-list -n1 HEAD)
+          GIT_COMMIT=$(git rev-parse HEAD)
+          BUILD_DATE=$(date -u -Iseconds)
+          PKG=github.com/cloudstack/cloudstack-csi-driver
+          LDFLAGS="-s -w -X ${PKG}/pkg/driver.driverVersion=${REV} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE}"
 
           for img in $IMAGES; do
-              docker tag ${img} ${REGISTRY_NAME}/${img}:${VERSION}
-              docker push ${REGISTRY_NAME}/${img}:${VERSION}
+              docker buildx build \
+                --platform linux/amd64,linux/arm64 \
+                --file ./cmd/${img}/Dockerfile \
+                --build-arg LDFLAGS="${LDFLAGS}" \
+                --tag ${REGISTRY_NAME}/${img}:${VERSION} \
+                --label org.opencontainers.image.revision=${GIT_COMMIT} \
+                --push \
+                .
           done
 
+      - name: Build syncer binary for upload
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          REV=$(git describe --long --tags --match='v*' --dirty 2>/dev/null || git rev-list -n1 HEAD)
+          GIT_COMMIT=$(git rev-parse HEAD)
+          BUILD_DATE=$(date -u -Iseconds)
+          PKG=github.com/cloudstack/cloudstack-csi-driver
+          LDFLAGS="-s -w -X ${PKG}/pkg/driver.driverVersion=${REV} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE}"
+
+          mkdir -p bin
+          CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o ./bin/cloudstack-csi-sc-syncer ./cmd/cloudstack-csi-sc-syncer
+
       - name: Upload cloudstack-csi-sc-syncer artifact
         if: startsWith(github.ref, 'refs/tags/v')
         uses: actions/upload-artifact@v4

cmd/cloudstack-csi-driver/Dockerfile

@@ -1,3 +1,22 @@
+FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
+
+ARG TARGETOS
+ARG TARGETARCH
+ARG LDFLAGS
+
+WORKDIR /workspace
+
+# Copy go mod files
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy source code
+COPY . .
+
+# Build
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
+    go build -ldflags "${LDFLAGS}" -o cloudstack-csi-driver ./cmd/cloudstack-csi-driver
+
 FROM alpine:3.18
 
 LABEL \
@@ -18,5 +37,5 @@ RUN apk add --no-cache \
     # Provides udevadm for device path detection \
     udev
 
-COPY ./bin/cloudstack-csi-driver /cloudstack-csi-driver
+COPY --from=builder /workspace/cloudstack-csi-driver /cloudstack-csi-driver
 ENTRYPOINT ["/cloudstack-csi-driver"]

cmd/cloudstack-csi-sc-syncer/Dockerfile

@@ -1,3 +1,22 @@
+FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
+
+ARG TARGETOS
+ARG TARGETARCH
+ARG LDFLAGS
+
+WORKDIR /workspace
+
+# Copy go mod files
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy source code
+COPY . .
+
+# Build
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
+    go build -ldflags "${LDFLAGS}" -o cloudstack-csi-sc-syncer ./cmd/cloudstack-csi-sc-syncer
+
 FROM alpine:3.18
 
 LABEL \
@@ -6,5 +25,5 @@ LABEL \
 
 RUN apk add --no-cache ca-certificates
 
-COPY ./bin/cloudstack-csi-sc-syncer /cloudstack-csi-sc-syncer
+COPY --from=builder /workspace/cloudstack-csi-sc-syncer /cloudstack-csi-sc-syncer
 ENTRYPOINT ["/cloudstack-csi-sc-syncer"]