Enable multiarch builds

tiiuae · Aug 10, 2023 · ee4027c · ee4027c
1 parent 9a2dbef
commit ee4027c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
@@ -69,6 +69,12 @@ jobs:
         with:
           path: px4-firmware
           fetch-depth: 0
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: amd64,riscv64,arm64
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Download pixhawk artifacts
         uses: actions/download-artifact@v3
         with:
@@ -95,6 +101,7 @@ jobs:
         with:
           push: true
           context: .
+          platforms: linux/amd64,linux/arm64,linux/riscv64
           file: px4-firmware/Tools/px_uploader.Dockerfile
           tags: ${{ steps.containermeta.outputs.tags }}
           labels: ${{ steps.containermeta.outputs.labels }}

diff --git a/Tools/px_uploader.Dockerfile b/Tools/px_uploader.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:alpine3.14
+FROM alpine:edge
 
 # run this with something like:
 #
@@ -17,6 +17,12 @@ FROM python:alpine3.14
 # ("/" above is relative to GH action runner home dir)
 # (see .github/workflows/tiiuae-pixhawk.yaml)
 
+# Swapped python:alpine image to alpine image, need to set up python first.
+ENV PYTHONUNBUFFERED=1
+RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
+RUN python3 -m ensurepip
+RUN pip3 install --no-cache --upgrade pip setuptools
+
 WORKDIR /firmware
 
 ENTRYPOINT ["/entrypoint.sh"]