From 475335244fa9b562430e50bdbacf25ea5aaee995 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 28 Oct 2025 08:25:52 +0100 Subject: [PATCH 1/6] Secrets are not available for pull requests from a fork --- .github/workflows/build-image-debian.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-image-debian.yaml b/.github/workflows/build-image-debian.yaml index 0c728ea..c2c98f4 100644 --- a/.github/workflows/build-image-debian.yaml +++ b/.github/workflows/build-image-debian.yaml @@ -37,11 +37,11 @@ jobs: with: images: ${{ env.REGISTRY_IMAGE }} - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + # - name: Login to DockerHub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Set up Docker Buildx id: buildx @@ -85,11 +85,11 @@ jobs: pattern: digests-* merge-multiple: true - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + # - name: Login to Docker Hub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From b9bef3e4367235eb4bc23060ce8426e4f31cce25 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 28 Oct 2025 08:38:06 +0100 Subject: [PATCH 2/6] update triggers to run for changes in .github --- .github/workflows/build-image-debian.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image-debian.yaml b/.github/workflows/build-image-debian.yaml index c2c98f4..85e0f7f 100644 --- a/.github/workflows/build-image-debian.yaml +++ b/.github/workflows/build-image-debian.yaml @@ -3,12 +3,12 @@ name: Build Debian Container Image on: pull_request: paths: + - ".github/**" - "debian/**" push: paths: + - ".github/**" - "debian/**" - branches: - - master env: REGISTRY_IMAGE: invoiceninja/invoiceninja-debian From b572bccd0ead799a02a8e15205a46daf11b841e8 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 28 Oct 2025 08:44:59 +0100 Subject: [PATCH 3/6] no push and merge --- .github/workflows/build-image-debian.yaml | 58 +++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-image-debian.yaml b/.github/workflows/build-image-debian.yaml index 85e0f7f..3d1b5e2 100644 --- a/.github/workflows/build-image-debian.yaml +++ b/.github/workflows/build-image-debian.yaml @@ -55,7 +55,7 @@ jobs: platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} tags: ${{ env.REGISTRY_IMAGE }} - outputs: type=image,push-by-digest=true,name-canonical=true,push=true + outputs: type=image,push-by-digest=true,name-canonical=true cache-from: type=gha cache-to: type=gha,mode=max @@ -73,35 +73,35 @@ jobs: if-no-files-found: error retention-days: 1 - merge: - runs-on: ubuntu-latest - needs: - - build - steps: - - name: Download digests - uses: actions/download-artifact@v4 - with: - path: ${{ runner.temp }}/digests - pattern: digests-* - merge-multiple: true + # merge: + # runs-on: ubuntu-latest + # needs: + # - build + # steps: + # - name: Download digests + # uses: actions/download-artifact@v4 + # with: + # path: ${{ runner.temp }}/digests + # pattern: digests-* + # merge-multiple: true - # - name: Login to Docker Hub - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_PASSWORD }} + # - name: Login to Docker Hub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY_IMAGE }} + # - name: Docker meta + # id: meta + # uses: docker/metadata-action@v5 + # with: + # images: ${{ env.REGISTRY_IMAGE }} - - name: Create manifest list and push (--dry-run) - working-directory: ${{ runner.temp }}/digests - run: | - docker buildx imagetools create --dry-run $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + # - name: Create manifest list and push (--dry-run) + # working-directory: ${{ runner.temp }}/digests + # run: | + # docker buildx imagetools create --dry-run $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + # $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) From fc6d89b9ef250af61a45d9ae2570d0827ad4e655 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 28 Oct 2025 08:57:58 +0100 Subject: [PATCH 4/6] Cleanup --- .github/workflows/build-image-debian.yaml | 55 +---------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/.github/workflows/build-image-debian.yaml b/.github/workflows/build-image-debian.yaml index 3d1b5e2..f84e99e 100644 --- a/.github/workflows/build-image-debian.yaml +++ b/.github/workflows/build-image-debian.yaml @@ -37,17 +37,11 @@ jobs: with: images: ${{ env.REGISTRY_IMAGE }} - # - name: Login to DockerHub - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 - - name: Build and push by digest + - name: Build id: build uses: docker/build-push-action@v6 with: @@ -58,50 +52,3 @@ jobs: outputs: type=image,push-by-digest=true,name-canonical=true cache-from: type=gha cache-to: type=gha,mode=max - - - name: Export digest - run: | - mkdir -p ${{ runner.temp }}/digests - digest="${{ steps.build.outputs.digest }}" - touch "${{ runner.temp }}/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: ${{ runner.temp }}/digests/* - if-no-files-found: error - retention-days: 1 - - # merge: - # runs-on: ubuntu-latest - # needs: - # - build - # steps: - # - name: Download digests - # uses: actions/download-artifact@v4 - # with: - # path: ${{ runner.temp }}/digests - # pattern: digests-* - # merge-multiple: true - - # - name: Login to Docker Hub - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_PASSWORD }} - - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 - - # - name: Docker meta - # id: meta - # uses: docker/metadata-action@v5 - # with: - # images: ${{ env.REGISTRY_IMAGE }} - - # - name: Create manifest list and push (--dry-run) - # working-directory: ${{ runner.temp }}/digests - # run: | - # docker buildx imagetools create --dry-run $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - # $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) From 854b1049158f41250ce562160600fb58196faac4 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 28 Oct 2025 14:54:05 +0100 Subject: [PATCH 5/6] Update badges --- .../{publish-image.yaml => publish-image-debian.yaml} | 0 README.md | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{publish-image.yaml => publish-image-debian.yaml} (100%) diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image-debian.yaml similarity index 100% rename from .github/workflows/publish-image.yaml rename to .github/workflows/publish-image-debian.yaml diff --git a/README.md b/README.md index c8537fa..8d959ac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Docker Image Size](https://img.shields.io/docker/image-size/invoiceninja/invoiceninja-debian?label=debian)](https://hub.docker.com/r/invoiceninja/invoiceninja-debian) [![Docker Pulls](https://img.shields.io/docker/pulls/invoiceninja/invoiceninja-debian)](https://hub.docker.com/r/invoiceninja/invoiceninja-debian) -[![Publish Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml) -[![Build Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml) +[![Publish Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image-debian.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image-debian.yaml) +[![Build Status](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-debian.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-debian.yaml) # Debian Docker for [Invoice Ninja](https://www.invoiceninja.com/) From 77807f94f478beccade4e53e8f6705924aad8cf3 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 28 Oct 2025 15:01:47 +0100 Subject: [PATCH 6/6] cleanup workflow --- .github/workflows/build-image-debian.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build-image-debian.yaml b/.github/workflows/build-image-debian.yaml index f84e99e..4cdd012 100644 --- a/.github/workflows/build-image-debian.yaml +++ b/.github/workflows/build-image-debian.yaml @@ -26,11 +26,6 @@ jobs: - name: Checkout uses: actions/checkout@v5 - - name: Prepare - run: | - platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - name: Docker meta id: meta uses: docker/metadata-action@v5