diff --git a/.gitea/workflows/docker-build-multiarch.yml b/.gitea/workflows/docker-build-multiarch.yml index dee964c..421012d 100644 --- a/.gitea/workflows/docker-build-multiarch.yml +++ b/.gitea/workflows/docker-build-multiarch.yml @@ -11,7 +11,7 @@ env: jobs: build-and-push: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: read packages: write @@ -20,14 +20,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up QEMU (for cross-compiling) - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 + run: | + docker buildx create --name multi --use + docker buildx inspect --bootstrap - # Login to your Gitea registry: provide REGISTRY_USER / REGISTRY_PASSWORD as repo secrets in Gitea - name: Log in to registry uses: docker/login-action@v3 with: @@ -35,31 +32,13 @@ jobs: username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_TOKEN }} - # Optional: derive tags/labels from repo metadata; comment out if you prefer static tags only - - name: Docker metadata - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=raw,value=${{ env.TAG_NAME }} - type=raw,value=sha-${{ github.sha }} - flavor: | - latest=false - - - name: Build and push (multi-arch) - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile - push: true - platforms: ${{ env.PLATFORMS }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - # Optional: print the final manifest list for verification + - name: Build Docker image + run: | + docker buildx build \ + --platform ${{ env.PLATFORMS }} \ + -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} \ + --push --progress=plain . + - name: Inspect pushed manifest run: | - docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} + docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5b024f2..90ecd8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,7 +131,7 @@ RUN git clone https://github.com/stevenlovegrove/Pangolin.git && \ -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON \ # -DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=OFF \ .. && \ - make -j1 && \ + make -j2 && \ make install && \ ldconfig