diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e8354c9..d75e266 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: contents: "read" strategy: matrix: - arch: ["native", "amd64", "arm64v8"] + arch: ["arm64v8"] steps: - name: "Checkout project" uses: "actions/checkout@v4" @@ -47,7 +47,7 @@ jobs: contents: "read" strategy: matrix: - arch: ["amd64", "arm64v8"] + arch: ["arm64v8"] steps: - name: "Checkout project" uses: "actions/checkout@v4" @@ -59,40 +59,38 @@ jobs: - name: "Login to Docker Hub" uses: "docker/login-action@v3" with: - registry: "docker.io" - username: "${{ secrets.DOCKERHUB_USERNAME }}" - password: "${{ secrets.DOCKERHUB_TOKEN }}" + registry: "d.lilpenguins.com" - name: "Load and push image" run: | make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image" - push-manifest: - name: "Push manifest" - if: "startsWith(github.ref, 'refs/tags/v')" - needs: ["push"] - runs-on: "ubuntu-latest" - permissions: - contents: "read" - steps: - - name: "Checkout project" - uses: "actions/checkout@v4" - - name: "Login to Docker Hub" - uses: "docker/login-action@v3" - with: - registry: "docker.io" - username: "${{ secrets.DOCKERHUB_USERNAME }}" - password: "${{ secrets.DOCKERHUB_TOKEN }}" - - name: "Push manifest" - run: | - make push-cross-manifest +# push-manifest: +# name: "Push manifest" +# if: "startsWith(github.ref, 'refs/tags/v')" +# needs: ["push"] +# runs-on: "ubuntu-latest" +# permissions: +# contents: "read" +# steps: +# - name: "Checkout project" +# uses: "actions/checkout@v4" +# - name: "Login to Docker Hub" +# uses: "docker/login-action@v3" +# with: +# registry: "docker.io" +# username: "${{ secrets.DOCKERHUB_USERNAME }}" +# password: "${{ secrets.DOCKERHUB_TOKEN }}" +# - name: "Push manifest" +# run: | +# make push-cross-manifest - publish-github-release: - name: "Publish GitHub release" - if: "startsWith(github.ref, 'refs/tags/v')" - needs: ["push-manifest"] - runs-on: "ubuntu-latest" - permissions: - contents: "write" - steps: - - name: "Publish" - uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68" +# publish-github-release: +# name: "Publish GitHub release" +# if: "startsWith(github.ref, 'refs/tags/v')" +# needs: ["push-manifest"] +# runs-on: "ubuntu-latest" +# permissions: +# contents: "write" +# steps: +# - name: "Publish" +# uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68" diff --git a/Dockerfile.m4 b/Dockerfile.m4 index 3a52b46..982617e 100644 --- a/Dockerfile.m4 +++ b/Dockerfile.m4 @@ -4,7 +4,7 @@ m4_changequote([[, ]]) ## "build" stage ################################################## -m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS build +m4_ifdef([[CROSS_ARCH]], [[FROM dtcooper/raspberrypi-os:latest]], [[FROM dtcooper/raspberrypi-os:latest]]) AS build SHELL ["/bin/sh", "-euc"]