fix: Docker image build and deployment process for Pi 4

Screenly · Jan 9, 2025 · a0841a1 · a0841a1
1 parent 81c36dd
commit a0841a1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -29,7 +29,7 @@ jobs:
     needs: run-tests
     strategy:
       matrix:
-        board: ['pi1', 'pi2', 'pi3', 'pi4', 'pi5', 'x86']
+        board: ['pi1', 'pi2', 'pi3', 'pi4-arm', 'pi4-arm64', 'pi5', 'x86']
         python-version: ["3.11"]
     runs-on: ubuntu-latest
 
@@ -80,9 +80,21 @@ jobs:
 
       - name: Build Containers
         run: |
-          poetry run python -m tools.image_builder \
-            --build-target=${{ matrix.board }} \
-            --push
+          if [ "${{ matrix.board }}" == "pi4-arm" ]; then
+            poetry run python -m tools.image_builder \
+              --build-target=pi4 \
+              --target-platform=linux/arm/v8 \
+              --push
+          elif [ "${{ matrix.board }}" == "pi4-arm64" ]; then
+            poetry run python -m tools.image_builder \
+              --build-target=pi4 \
+              --target-platform=linux/arm64/v8 \
+              --push
+          else
+            poetry run python -m tools.image_builder \
+              --build-target=${{ matrix.board }} \
+              --push
+          fi
 
   balena:
     if: ${{ github.ref == 'refs/heads/master' }}

diff --git a/tools/image_builder/__main__.py b/tools/image_builder/__main__.py
@@ -128,6 +128,10 @@ def build_image(
     default='x86',
     type=click.Choice(BUILD_TARGET_OPTIONS),
 )
+@click.option(
+    '--target-platform',
+    help='Override the default target platform',
+)
 @click.option(
     '--service',
     default=['all'],
@@ -157,6 +161,7 @@ def build_image(
 def main(
     clean_build: bool,
     build_target: str,
+    target_platform: str,
     service,
     disable_cache_mounts: bool,
     environment: str,
@@ -169,7 +174,7 @@ def main(
 
     build_parameters = get_build_parameters(build_target)
     board = build_parameters['board']
-    target_platform = build_parameters['target_platform']
+    platform = target_platform or build_parameters['target_platform']
     base_image = build_parameters['base_image']
 
     docker_tag = get_docker_tag(git_branch, board)
@@ -186,7 +191,7 @@ def main(
         build_image(
             service,
             board,
-            target_platform,
+            platform,
             disable_cache_mounts,
             git_hash,
             git_short_hash,