Merge pull request #128 from wasmCloud/fix/arm_build

Adds support for building arm image

Author: thomastaylor312

.github/workflows/release.yml

@@ -195,6 +195,18 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: wadm-${{ env.RELEASE_VERSION }}-linux-aarch64
+          path: ./artifacts
+      - run: mv ./artifacts/wadm ./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64 && chmod +x ./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64
+          
+      - uses: actions/download-artifact@v3
+        with:
+          name: wadm-${{ env.RELEASE_VERSION }}-linux-amd64
+          path: ./artifacts
+      - run: mv ./artifacts/wadm ./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64 && chmod +x ./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -211,6 +223,11 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v')
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
+          context: ./
+          build-args: |
+            BIN_ARM64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64
+            BIN_AMD64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64
           tags: ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}
 
       - name: Build and push (main)

Dockerfile

@@ -1,26 +1,24 @@
-FROM rust:1.68.0-slim as builder
+FROM debian:bullseye-slim AS base
 
-WORKDIR /usr/src/wadm
+FROM base AS base-amd64
+ARG BIN_AMD64
+ARG BIN=$BIN_AMD64
 
-COPY . /usr/src/wadm/
+FROM base AS base-arm64
+ARG BIN_ARM64
+ARG BIN=$BIN_ARM64
 
-RUN rustup target add x86_64-unknown-linux-musl
-RUN apt update && apt install -y musl-tools musl-dev
-RUN update-ca-certificates
-
-RUN cargo build --bin wadm --features cli --target x86_64-unknown-linux-musl --release
-
-FROM alpine:3.16.0 AS runtime 
+FROM base-$TARGETARCH
 
 ARG USERNAME=wadm
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
-RUN addgroup -g $USER_GID $USERNAME \
-    && adduser -D -u $USER_UID -G $USERNAME $USERNAME
+RUN addgroup --gid $USER_GID $USERNAME \
+    && adduser --disabled-login -u $USER_UID --ingroup $USERNAME $USERNAME
 
-# Copy application binary from builder image
-COPY --from=builder --chown=$USERNAME /usr/src/wadm/target/x86_64-unknown-linux-musl/release/wadm /usr/local/bin/wadm
+# Copy application binary from disk
+COPY --chown=$USERNAME ${BIN} /usr/local/bin/wadm
 
 USER $USERNAME
 # Run the application