28 add arm support

.github/workflows/publish-docker-image.yml

@@ -8,9 +8,25 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
+    # Checkout code
     - uses: actions/checkout@v3
-    - name: Build image
-      run: docker buildx build . --tag "epicwink/proxpi:${{ github.ref_name }}"
+
+    # Configure buildx to support multiple architectures
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
+
+    # Build amd64 for testing
+    - name: Build and export to Docker
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        load: true
+        tags: epicwink/proxpi:${{ github.ref_name }}
+        platforms: linux/amd64
+
+    # Run tests
     - name: Run unit-tests in image
       run: docker run
         --rm
@@ -20,21 +36,17 @@ jobs:
         sh -c 'pip install --requirement /srv/tests/requirements.txt
         && pytest -vvra /srv/tests'
     - name: Run image test
-      run: tests/test-docker-image.sh "${{ github.ref_name }}"
+      run: tests/test-docker-image.sh "epicwink/proxpi:${{ github.ref_name }}"
+
+    # Build all architectures and push to dockerhub
     - name: Login to DockerHub
       run: >
         echo ${{ secrets.DOCKERHUB_PASSWORD }}
         | docker login --password-stdin -u epicwink
-    - name: Publish image
-      run: docker push "epicwink/proxpi:${{ github.ref_name }}"
-    - name: Check tag
-      id: check-tag
-      run: |
-        if [[ "${{ github.ref_name }}" =~ '^v\d+\.\d+\.\d+$' ]]; then
-            echo ::set-output name=match::true
-        fi
-    - name: Publish latest image
-      if: steps.check-tag.outputs.match == 'true'
-      run: |
-        docker tag "epicwink/proxpi:${{ github.ref_name }}" epicwink/proxpi:latest
-        docker push epicwink/proxpi:latest
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
+        push: true
+        tags: epicwink/proxpi:${{ github.ref_name }},epicwink/proxpi:latest

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.12-alpine
 
 RUN --mount=source=.,target=/root/src/proxpi,rw \
     uname -a && cat /etc/issue && apk --version && python --version && pip --version \
- && apk --no-cache add git \
+ && apk --no-cache add git build-base libxslt-dev libxml2-dev \
  && git -C /root/src/proxpi restore .dockerignore \
  && pip install --no-cache-dir --no-deps \
     --requirement /root/src/proxpi/app.requirements.txt \

tests/test-docker-image.sh

@@ -2,7 +2,7 @@
 
 # Test Docker image
 #
-# Usage: test-docker-image.sh TAG
+# Usage: test-docker-image.sh REPO/IMAGE:TAG
 # where TAG is Docker image tag (not including repository)
 
 # Make command errors cause script to fail
@@ -21,7 +21,7 @@ cleanUp () {
 # Start proxpi server
 container="$(docker create \
   --publish 5042:5000 \
-  "epicwink/proxpi:$1"
+  "$1"
 )"
 echo "created container: $container" 1>&2