Update Dockerfile

This commit is contained in:
2025-10-31 13:48:28 -04:00
parent a3c96f634b
commit 21aa70b37b
2 changed files with 13 additions and 34 deletions

View File

@@ -11,7 +11,7 @@ env:
jobs: jobs:
build-and-push: build-and-push:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -20,14 +20,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Set up QEMU (for cross-compiling)
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
id: buildx run: |
uses: docker/setup-buildx-action@v3 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 - name: Log in to registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
@@ -35,31 +32,13 @@ jobs:
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_TOKEN }} password: ${{ secrets.REGISTRY_TOKEN }}
# Optional: derive tags/labels from repo metadata; comment out if you prefer static tags only - name: Build Docker image
- name: Docker metadata run: |
id: meta docker buildx build \
uses: docker/metadata-action@v5 --platform ${{ env.PLATFORMS }} \
with: -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} \
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} --push --progress=plain .
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: Inspect pushed manifest - name: Inspect pushed manifest
run: | 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 }}

View File

@@ -131,7 +131,7 @@ RUN git clone https://github.com/stevenlovegrove/Pangolin.git && \
-DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON \ -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON \
# -DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=OFF \ # -DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=OFF \
.. && \ .. && \
make -j1 && \ make -j2 && \
make install && \ make install && \
ldconfig ldconfig