From 26d0b85942e70a4e5fe1a0920a06f47878b7be6d Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 2 Sep 2024 18:13:20 +0100 Subject: [PATCH] Quick rename (makes it easier to find in the required checks list) Signed-off-by: Adam Warner --- .github/workflows/build-and-publish.yml | 6 +- .github/workflows/build-and-test.yml | 2 +- .github/workflows/test-and-build-v6.yml | 147 ------------------------ 3 files changed, 3 insertions(+), 152 deletions(-) delete mode 100644 .github/workflows/test-and-build-v6.yml diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 28434cb..2813d35 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -1,10 +1,8 @@ -name: Build and Publish (development-v6) +name: Build Image and Publish on: schedule: - cron: "0 5 * * *" - push: - branches: - - development-v6 + env: dockerhub: ${{ secrets.DOCKERHUB_NAMESPACE }}/pihole diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 598f908..fe8c01c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,4 +1,4 @@ -name: Build and Test (development-v6) +name: Build Image and Test on: pull_request: diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml deleted file mode 100644 index 09d2dde..0000000 --- a/.github/workflows/test-and-build-v6.yml +++ /dev/null @@ -1,147 +0,0 @@ -name: Build and Publish (development-v6) -on: - schedule: - - cron: "0 5 * * *" - push: - branches: - - development-v6 - -env: - dockerhub: ${{ secrets.DOCKERHUB_NAMESPACE }}/pihole - ghcr: ghcr.io/${{ github.repository_owner }}/pihole - -jobs: - build: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - platform: [linux/amd64, linux/386, linux/arm/v6, linux/arm/v7, linux/arm64] - alpine_version: [3.19] - include: - - platform: linux/riscv64 - alpine_version: edge - - steps: - - name: Prepare name for digest up/download - run: | - platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Checkout Repo - uses: actions/checkout@v4 - with: - ref: development-v6 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - images: | - ${{ env.dockerhub }} - ${{ env.ghcr }} - flavor: | - latest=false - tags: | - development-v6 - - - name: Login to DockerHub and GitHub Container Registry - uses: ./.github/actions/login-repo - with: - docker_username: ${{ secrets.DOCKERHUB_USER }} - docker_password: ${{ secrets.DOCKERHUB_PASS }} - ghcr_username: ${{ github.repository_owner }} - ghcr_password: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform}} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build container and push by digest - id: build - uses: docker/build-push-action@v6 - with: - context: ./src/ - platforms: ${{ matrix.platform }} - build-args: | - PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }} - alpine_version=${{ matrix.alpine_version }} - labels: ${{ steps.meta.outputs.labels }} - outputs: | - type=image,name=${{ env.dockerhub }},push-by-digest=true,name-canonical=true,push=true - - - name: Export digests - run: | - mkdir -p /tmp/digests - digest_docker="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest_docker#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - # Merge all the digests into a single file - # If we would push immediately above, the individual runners would overwrite each other's images - # https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners - merge-and-deploy: - runs-on: ubuntu-latest - needs: - - build - steps: - - name: Checkout Repo - uses: actions/checkout@v4 - with: - ref: development-v6 - - - name: Download digests - uses: actions/download-artifact@v4 - with: - path: /tmp/digests - pattern: digests-* - merge-multiple: true - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - images: | - ${{ env.dockerhub }} - ${{ env.ghcr }} - flavor: | - latest=false - tags: | - development-v6 - - - name: Login to DockerHub and GitHub Container Registry - uses: ./.github/actions/login-repo - with: - docker_username: ${{ secrets.DOCKERHUB_USER }} - docker_password: ${{ secrets.DOCKERHUB_PASS }} - ghcr_username: ${{ github.repository_owner }} - ghcr_password: ${{ secrets.GITHUB_TOKEN }} - - - name: Create manifest list and push (DockerHub and GitHub Container Registry) - working-directory: /tmp/digests - run: | - docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.dockerhub }}@sha256:%s ' *) - docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.ghcr }}@sha256:%s ' *) - - - name: Inspect images - run: | - docker buildx imagetools inspect ${{ env.dockerhub }}:${{ steps.meta.outputs.version }} - docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }} \ No newline at end of file