From fa4dc16ad79768a73aefcf42b6d1ae8edee3e0f0 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 21:55:51 +0200 Subject: [PATCH 01/43] chore: Update Docker workflow to use Buildpacks The Docker workflow has been updated to use Buildpacks for building and pushing the Docker image. This change improves the build process and ensures compatibility with the latest versions of the required dependencies. --- .github/workflows/docker.yml | 56 ++++-------------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e581504f..374c3c89 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: Docker Release on: push: tags: - - '*' + - "*" branches: - master @@ -11,56 +11,12 @@ permissions: contents: read jobs: - init: - permissions: - contents: none - runs-on: ubuntu-latest - outputs: - do_docker: ${{ steps.vars.outputs.IS_DOCKERHUB_PUSH }} - steps: - - name: Initialize workflow variables - shell: bash - run: | - # work-around for inaccessible 'secrets' object for 'if'; see ) - unset IS_DOCKERHUB_PUSH - if [ -z "$DOCKERHUB_PUSH" ]; then IS_DOCKERHUB_PUSH='false'; else IS_DOCKERHUB_PUSH='true' ; fi - echo set-output name=IS_DOCKERHUB_PUSH::${IS_DOCKERHUB_PUSH} - echo ::set-output name=IS_DOCKERHUB_PUSH::${IS_DOCKERHUB_PUSH} - env: - DOCKERHUB_PUSH: ${{ secrets.DOCKERHUB_PUSH }} - build: + docker: name: Build and push Docker image runs-on: ubuntu-latest - needs: [init] - if: ${{ needs.init.outputs.do_docker == 'true' }} steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Build and push latest - uses: docker/build-push-action@v2 - if: github.ref == 'refs/heads/master' - with: - push: true - tags: ${{ secrets.DOCKERHUB_REPO }}:latest - - - name: Set version variable - id: version - if: startsWith(github.ref, 'refs/tags/') - run: echo ::set-output name=TAG::${GITHUB_REF#refs/tags/} - - - name: Build and push tag - uses: docker/build-push-action@v2 - if: startsWith(github.ref, 'refs/tags/') - with: - push: true - tags: ${{ secrets.DOCKERHUB_REPO }}:${{ steps.version.outputs.TAG }} + uses: actions/checkout@v4 + - name: Set up Buildpacks + uses: buildpacks/github-actions/setup-pack@v5.0.0 + - run: pack build mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs \ No newline at end of file From 6432b4a72c699c3669283e2b0e69eef5e38efb7b Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 21:57:23 +0200 Subject: [PATCH 02/43] chore: add workflow dispatch --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 374c3c89..a957bbf7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,11 +1,10 @@ -name: Docker Release - on: push: tags: - "*" branches: - master + workflow_dispatch: permissions: contents: read From b88d090714a85d7289b8a08c3d2a17118f643a1a Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:04:15 +0200 Subject: [PATCH 03/43] chore: docker login --- .github/workflows/docker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a957bbf7..db609016 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,6 +16,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks uses: buildpacks/github-actions/setup-pack@v5.0.0 - - run: pack build mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs \ No newline at end of file + - run: pack build ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --publish \ No newline at end of file From b65c0a0c14df39e092a46a12e9e4c5bafe64b09a Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:10:32 +0200 Subject: [PATCH 04/43] chore: add multi arch builds --- .github/workflows/docker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index db609016..594178f2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,4 +23,9 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks uses: buildpacks/github-actions/setup-pack@v5.0.0 - - run: pack build ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --publish \ No newline at end of file + - run: pack build \ + ${{ secrets.DOCKERHUB_USERNAME }}/mergeable \ + --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny \ + -b docker.io/paketobuildpacks/nodejs \ + --platform linux/amd64,linux/arm64 \ + --publish \ No newline at end of file From 2fea88d6968e2267e26e5e2eabfd053bf8e98feb Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:12:31 +0200 Subject: [PATCH 05/43] fix linebreaks --- .github/workflows/docker.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 594178f2..53d2e430 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,9 +23,4 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks uses: buildpacks/github-actions/setup-pack@v5.0.0 - - run: pack build \ - ${{ secrets.DOCKERHUB_USERNAME }}/mergeable \ - --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny \ - -b docker.io/paketobuildpacks/nodejs \ - --platform linux/amd64,linux/arm64 \ - --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file From 3977607369929573bf61e52acf0b8a7a8543770c Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:16:58 +0200 Subject: [PATCH 06/43] print pack version --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 53d2e430..25bc59e5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,4 +23,5 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks uses: buildpacks/github-actions/setup-pack@v5.0.0 + - run: pack --version - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file From 3928ca4aa486b9b725f170362a8dc8f2b551ef18 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:18:55 +0200 Subject: [PATCH 07/43] update pack action --- .github/workflows/docker.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 25bc59e5..09480914 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,6 +22,9 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks - uses: buildpacks/github-actions/setup-pack@v5.0.0 - - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file + uses: buildpacks/github-actions/setup-pack@v5.7.0 + - run: pack build \ + ${{ secrets.DOCKERHUB_USERNAME }}/mergeable \ + --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny \ + -b docker.io/paketobuildpacks/nodejs \ + --publish \ No newline at end of file From 3734f80b0a627c55f7bbe2ca4c7177ce06a92261 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:20:14 +0200 Subject: [PATCH 08/43] chore: Update Docker workflow to use Buildpacks --- .github/workflows/docker.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 09480914..be5b7b85 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,8 +23,5 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks uses: buildpacks/github-actions/setup-pack@v5.7.0 - - run: pack build \ - ${{ secrets.DOCKERHUB_USERNAME }}/mergeable \ - --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny \ - -b docker.io/paketobuildpacks/nodejs \ - --publish \ No newline at end of file + - run: pack --version + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file From cfbc18741e195d81a6390d66023c9e754acf0737 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:21:34 +0200 Subject: [PATCH 09/43] curl --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index be5b7b85..ad5fa556 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,6 +22,6 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks - uses: buildpacks/github-actions/setup-pack@v5.7.0 + run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-macos.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file From b8787acbdab581159f2fefa89c5acbe06dff1009 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:23:03 +0200 Subject: [PATCH 10/43] use linux version of pack --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ad5fa556..e23c0c9c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,6 +22,6 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildpacks - run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-macos.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) + run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file From 9aedd77f53758f80a4c725d4113413f4c778e532 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:26:06 +0200 Subject: [PATCH 11/43] fix platform --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e23c0c9c..d7bb5b22 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform linux/amd64,linux/arm64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64,arm64 --publish \ No newline at end of file From a191b54d0cac3e85d9b2979f88acb26f030c6775 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:27:03 +0200 Subject: [PATCH 12/43] fix platform --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d7bb5b22..7dc3f260 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64,arm64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --platform arm64 --publish \ No newline at end of file From 03a735dc54965ad1118642d8024e460c61cc055b Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:28:33 +0200 Subject: [PATCH 13/43] use only arm --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7dc3f260..c58103e4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --platform arm64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform arm64 --publish \ No newline at end of file From 68c5d0ca740d5dcab01f25908a688c24c456a1d9 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:29:10 +0200 Subject: [PATCH 14/43] no platform --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c58103e4..7995ba59 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform arm64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --publish \ No newline at end of file From 81550735292301c7e72ff59b4eacb6b2b5cfeac6 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:30:52 +0200 Subject: [PATCH 15/43] try amd --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7995ba59..988ee20b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --publish \ No newline at end of file From 07aa71a7c18006974e3b1586f58b52a7b4857d15 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:31:48 +0200 Subject: [PATCH 16/43] remove buildpackless --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 988ee20b..fd934c1d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --publish \ No newline at end of file From f3a993a59615b6ac19f8b64ab4ed8654e83aa596 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:33:43 +0200 Subject: [PATCH 17/43] chore: Update Docker workflow to use Buildpacks with multiple platforms --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fd934c1d..2c6800d1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-full -b docker.io/paketobuildpacks/nodejs --platform amd64 --platform arm64 --publish \ No newline at end of file From bfbd8a1073d079c0644f3716c6beb35d782b2248 Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:35:13 +0200 Subject: [PATCH 18/43] chore: Update Docker workflow to use Buildpacks with multiple platforms --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2c6800d1..7dc3f260 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-full -b docker.io/paketobuildpacks/nodejs --platform amd64 --platform arm64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --platform arm64 --publish \ No newline at end of file From 86503570f25e1d50c8cce4095f07e5902689cf1c Mon Sep 17 00:00:00 2001 From: Ch4s3r Date: Fri, 31 May 2024 22:42:43 +0200 Subject: [PATCH 19/43] chore: Update Docker workflow to use Buildpacks with multiple platforms --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7dc3f260..584c281c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,4 @@ jobs: - name: Set up Buildpacks run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny -b docker.io/paketobuildpacks/nodejs --platform amd64 --platform arm64 --publish \ No newline at end of file + - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-base --platform amd64 --platform arm64 --publish \ No newline at end of file From a4c8dbbf2cf8e0513f95d16a65d083e50460a94e Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 16:54:25 +0200 Subject: [PATCH 20/43] Update docker.yml --- .github/workflows/docker.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 584c281c..c424c49c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,7 +21,5 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Set up Buildpacks - run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.34.1/pack-v0.34.1-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) - - run: pack --version - - run: pack build ${{ secrets.DOCKERHUB_USERNAME }}/mergeable --builder docker.io/paketobuildpacks/builder-jammy-base --platform amd64 --platform arm64 --publish \ No newline at end of file + - uses: buildpacks/github-actions/setup-pack@v5.7.1 + - run: pack build test/mergeable --builder docker.io/paketobuildpacks/builder-jammy-base --platform amd64 From 5001ae8ae27b3388f0ca37836a47a56bd25b1cfb Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 16:56:35 +0200 Subject: [PATCH 21/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c424c49c..4af5d1bd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build test/mergeable --builder docker.io/paketobuildpacks/builder-jammy-base --platform amd64 + - run: pack build test/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs From 850db9b3e9c13925b3bfec7c77348fd86e2b1d25 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 17:05:04 +0200 Subject: [PATCH 22/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4af5d1bd..46b9861c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build test/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs + - run: pack build Ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --cache-image index.docker.io/Ch4s3r/mergeable:latest --publish From 3532a80d4782bba2eb86a8187cfb1f3203d7f148 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 17:06:32 +0200 Subject: [PATCH 23/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 46b9861c..7213ba4d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build Ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --cache-image index.docker.io/Ch4s3r/mergeable:latest --publish + - run: pack build Ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish From f47326a9a0208b2863939e82a2cbebc5d0890e1e Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 17:07:52 +0200 Subject: [PATCH 24/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7213ba4d..71488ce0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build Ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish + - run: pack build . --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish -t Ch4s3r/mergeable From 85f832d50c7c72bd9ebbbee8d70393deacd1bb60 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 17:15:14 +0200 Subject: [PATCH 25/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 71488ce0..ab77a024 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build . --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish -t Ch4s3r/mergeable + - run: pack build . --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish ch4s3r/mergeable From 74182d9fafa1845595a65c24d9a1af1bef953e79 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 17:16:08 +0200 Subject: [PATCH 26/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ab77a024..e4c80cbe 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build . --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish ch4s3r/mergeable + - run: pack build ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish From 3abfa15bfe64299c3383e6e813a318a93a84f513 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 17:16:47 +0200 Subject: [PATCH 27/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e4c80cbe..befda0a1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,4 +22,4 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build ch4s3r/mergeable --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish + - run: pack build --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish --cache-image ch4s3r/mergeable ch4s3r/mergeable From 7a98a371f62e6a7afa4be4b21b6570d918ffc32a Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:13:55 +0200 Subject: [PATCH 28/43] Update docker.yml --- .github/workflows/docker.yml | 102 +++++++++++++++++++++++++++++++---- 1 file changed, 91 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index befda0a1..98eb732c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,25 +1,105 @@ +name: ci + on: push: - tags: - - "*" - branches: - - master - workflow_dispatch: -permissions: - contents: read +env: + REGISTRY_IMAGE: ch4s3r/mergeable jobs: - docker: - name: Build and push Docker image + build: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm/v6 + - linux/arm/v7 + - linux/arm64 steps: + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - name: Checkout uses: actions/checkout@v4 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v5 + with: + context: . + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#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: + runs-on: ubuntu-latest + needs: + - build + steps: + - 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: + images: ${{ env.REGISTRY_IMAGE }} + - name: Login to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish --cache-image ch4s3r/mergeable ch4s3r/mergeable + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} From 1e617cea434357813f268bb5fd6c5ca2f1304c8f Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:17:27 +0200 Subject: [PATCH 29/43] Update docker.yml --- .github/workflows/docker.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 98eb732c..289232c4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,9 +32,6 @@ jobs: with: images: ${{ env.REGISTRY_IMAGE }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 1d2a7defcba7bc83bbaa64060265c1623f30a0d5 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:24:42 +0200 Subject: [PATCH 30/43] Update docker.yml --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 289232c4..e5f7a053 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -49,6 +49,8 @@ jobs: platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + cache-from: type=gha,scope=build-${{ matrix.platform }} + cache-to: type=gha,scope=build-${{ matrix.platform }} - name: Export digest run: | From 54ba9c6d2705454025c99f50876f81be151abe0e Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:26:26 +0200 Subject: [PATCH 31/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e5f7a053..aeea71ca 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -50,7 +50,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true cache-from: type=gha,scope=build-${{ matrix.platform }} - cache-to: type=gha,scope=build-${{ matrix.platform }} + cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }} - name: Export digest run: | From c8d1b247c5d6fa8f726911364766a75669030477 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:32:31 +0200 Subject: [PATCH 32/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index aeea71ca..a81ef882 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,7 @@ jobs: matrix: platform: - linux/amd64 - - linux/arm/v6 + # - linux/arm/v6 - linux/arm/v7 - linux/arm64 steps: From 03064222bda1f7743f5f5449538be8ca67ad2ea6 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:36:29 +0200 Subject: [PATCH 33/43] Update docker.yml --- .github/workflows/docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a81ef882..cb24377a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -86,6 +86,9 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} + tags: | + # set latest tag for default branch + type=raw,value=latest,enable={{is_default_branch}} - name: Login to Docker Hub uses: docker/login-action@v3 From 33e0498241f73b3cdac88f0c322c45b7678caaff Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 18:52:58 +0200 Subject: [PATCH 34/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cb24377a..eb088035 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,7 +1,7 @@ name: ci on: - push: + workflow_dispatch: env: REGISTRY_IMAGE: ch4s3r/mergeable From 9bf03e638eb87560e505f713f8df9ef829e070f3 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:02:20 +0200 Subject: [PATCH 35/43] Create buildpack --- .github/workflows/buildpack | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/buildpack diff --git a/.github/workflows/buildpack b/.github/workflows/buildpack new file mode 100644 index 00000000..066acf91 --- /dev/null +++ b/.github/workflows/buildpack @@ -0,0 +1,25 @@ +on: + push: + branches: + - * + workflow_dispatch: + +permissions: + contents: read + +jobs: + docker: + name: Build and push Docker image + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - uses: buildpacks/github-actions/setup-pack@v5.7.1 + - run: pack build --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish --cache-image ch4s3r/mergeable:linux-amd64 ch4s3r/mergeable --platform linux/amd64 + - run: pack build --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish --cache-image ch4s3r/mergeable:linux-arm64 ch4s3r/mergeable --platform linux/arm64 + From cb422f3fc998ef8885dcdae04fd3771d4247f220 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:03:54 +0200 Subject: [PATCH 36/43] Rename buildpack to buildpack.yaml --- .github/workflows/{buildpack => buildpack.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{buildpack => buildpack.yaml} (100%) diff --git a/.github/workflows/buildpack b/.github/workflows/buildpack.yaml similarity index 100% rename from .github/workflows/buildpack rename to .github/workflows/buildpack.yaml From fa25e70c47987dbd3b737e3e05342bdc6a56ebf1 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:04:18 +0200 Subject: [PATCH 37/43] Update buildpack.yaml --- .github/workflows/buildpack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildpack.yaml b/.github/workflows/buildpack.yaml index 066acf91..34ba608d 100644 --- a/.github/workflows/buildpack.yaml +++ b/.github/workflows/buildpack.yaml @@ -1,7 +1,7 @@ on: push: branches: - - * + - "*" workflow_dispatch: permissions: From c85539afa0bae49532171fe94b00dd3996ef8b9a Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:42:34 +0200 Subject: [PATCH 38/43] Update docker.yml --- .github/workflows/docker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eb088035..141e22ff 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,9 @@ -name: ci +name: Docker on: + push: + tags: + - "*" workflow_dispatch: env: From acc96ba5296039a9c57ff99f1970755b84071a17 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:42:53 +0200 Subject: [PATCH 39/43] Delete .github/workflows/buildpack.yaml --- .github/workflows/buildpack.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/buildpack.yaml diff --git a/.github/workflows/buildpack.yaml b/.github/workflows/buildpack.yaml deleted file mode 100644 index 34ba608d..00000000 --- a/.github/workflows/buildpack.yaml +++ /dev/null @@ -1,25 +0,0 @@ -on: - push: - branches: - - "*" - workflow_dispatch: - -permissions: - contents: read - -jobs: - docker: - name: Build and push Docker image - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: buildpacks/github-actions/setup-pack@v5.7.1 - - run: pack build --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish --cache-image ch4s3r/mergeable:linux-amd64 ch4s3r/mergeable --platform linux/amd64 - - run: pack build --builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny --buildpack docker.io/paketobuildpacks/nodejs --publish --cache-image ch4s3r/mergeable:linux-arm64 ch4s3r/mergeable --platform linux/arm64 - From 9accbe77ffa10a36af60cdf9f0c44edf20f9cd37 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:50:11 +0200 Subject: [PATCH 40/43] Update docker.yml --- .github/workflows/docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 141e22ff..0b9fc48d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: ch4s3r/mergeable + REGISTRY_IMAGE: mergeability/mergeable jobs: build: @@ -17,6 +17,7 @@ jobs: matrix: platform: - linux/amd64 + # Failing to build # - linux/arm/v6 - linux/arm/v7 - linux/arm64 From 54a26fd2d22134028741d88dad464c355d44a096 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 19:52:19 +0200 Subject: [PATCH 41/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0b9fc48d..237f2155 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: mergeability/mergeable + REGISTRY_IMAGE: ch4s3r/mergeable jobs: build: From a80eaa9c9378e0578acf649f16850aea06794987 Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Fri, 7 Jun 2024 23:07:03 +0200 Subject: [PATCH 42/43] Update docker.yml --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 237f2155..c0341e05 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -91,6 +91,8 @@ jobs: with: images: ${{ env.REGISTRY_IMAGE }} tags: | + # minimal + type=semver,pattern={{version}} # set latest tag for default branch type=raw,value=latest,enable={{is_default_branch}} From 4bf215ee4802f2846ad2ba4ede42cf4cf71b8e1c Mon Sep 17 00:00:00 2001 From: Patrick 'Lampe' Lamprecht Date: Sat, 8 Jun 2024 00:13:28 +0200 Subject: [PATCH 43/43] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c0341e05..ffe21504 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: ch4s3r/mergeable + REGISTRY_IMAGE: mergeability/mergeable jobs: build: