get builder images working

Author: jvde-github

.github/workflows/build-builder-images.yml

@@ -88,20 +88,16 @@ jobs:
               ca-certificates \
               && rm -rf /var/lib/apt/lists/*
 
-          # Build and install RTL-SDR - Try with threads explicitly disabled first as workaround
+          # Build and install RTL-SDR
           WORKDIR /tmp/build
           RUN git clone https://gitea.osmocom.org/sdr/rtl-sdr.git --depth 1 && \
               cd rtl-sdr && \
               mkdir build && cd build && \
-              (cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+              cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
                        -DINSTALL_UDEV_RULES=OFF \
                        -DDETACH_KERNEL_DRIVER=ON \
                        -DCMAKE_THREAD_PREFER_PTHREAD=ON \
-                       -DTHREADS_PREFER_PTHREAD_FLAG=ON || \
-               (echo "=== CMAKE FAILED - Dumping error logs ===" && \
-                echo "=== CMakeError.log ===" && cat CMakeFiles/CMakeError.log && \
-                echo "=== CMakeOutput.log ===" && cat CMakeFiles/CMakeOutput.log && \
-                exit 1)) && \
+                       -DTHREADS_PREFER_PTHREAD_FLAG=ON && \
               make -j$(nproc) && \
               make install && \
               ldconfig
@@ -130,6 +126,15 @@ jobs:
           WORKDIR /workspace
           EOF
 
+      - name: Set platform based on distro
+        id: platforms
+        run: |
+          if [ "${{ matrix.distro }}" = "ubuntu" ]; then
+            echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
+          else
+            echo "platforms=linux/amd64,linux/arm64,linux/arm/v7" >> $GITHUB_OUTPUT
+          fi
+
       - name: Build and push builder image
         uses: docker/build-push-action@v5
         with:
@@ -138,7 +143,7 @@ jobs:
           build-args: |
             DISTRO=${{ matrix.distro }}
             CODENAME=${{ matrix.codename }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: ${{ steps.platforms.outputs.platforms }}
           push: true
           tags: |
             ghcr.io/${{ github.repository_owner }}/ais-catcher-builder:${{ matrix.distro }}-${{ matrix.codename }}