From d9ca573e24c1dcfc627b241ace5fbdbefd9eaecd Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 16:36:49 +1300 Subject: [PATCH 01/21] Testing build without docker credentials (#36) --- .github/workflows/build-push.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index dfe0b86..616891d 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -37,18 +37,18 @@ jobs: node: [ '20', '22', '24' ] steps: - - name: 🔑 Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: 🔑 Login to Docker Hub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: 🔑 Log in to the GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} +# - name: 🔑 Log in to the GitHub Container Registry +# uses: docker/login-action@v3 +# with: +# registry: ghcr.io +# username: ${{ github.actor }} +# password: ${{ secrets.GITHUB_TOKEN }} - name: 🐋 Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 4288d2e732b7f482ace852fb97e36b17328b51f8 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 17:03:46 +1300 Subject: [PATCH 02/21] Revert creds (#37) --- .github/workflows/build-push.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 616891d..dfe0b86 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -37,18 +37,18 @@ jobs: node: [ '20', '22', '24' ] steps: -# - name: 🔑 Login to Docker Hub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: 🔑 Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} -# - name: 🔑 Log in to the GitHub Container Registry -# uses: docker/login-action@v3 -# with: -# registry: ghcr.io -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} + - name: 🔑 Log in to the GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: 🐋 Set up Docker Buildx uses: docker/setup-buildx-action@v3 From ee8608b9f41961c9709a89c85b995cd9fa1e7df6 Mon Sep 17 00:00:00 2001 From: Nick Schuch Date: Fri, 31 Oct 2025 16:47:14 +1000 Subject: [PATCH 03/21] Don't use buildx action (#39) * Don't use buildx action * Fix the PR * Fix matrix --- .github/workflows/build-pr.yml | 4 ++++ .github/workflows/build-push.yml | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index ee10cb7..398b5f9 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -27,3 +27,7 @@ jobs: env: NODE_VERSION: ${{ matrix.node }} STREAM: ${{ env.stream }} + + - name: 🏗️ Build and push Docker image + run: | + NODE_VERSION=${{ matrix.node }} STREAM=${{ env.stream }} docker buildx bake --pull --no-cache diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index dfe0b86..b0aa554 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -37,6 +37,9 @@ jobs: node: [ '20', '22', '24' ] steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: 🔑 Login to Docker Hub uses: docker/login-action@v3 with: @@ -54,9 +57,5 @@ jobs: uses: docker/setup-buildx-action@v3 - name: 🏗️ Build and push Docker image - uses: docker/bake-action@v6 - env: - PHP_VERSION: ${{ matrix.php }} - STREAM: ${{ inputs.stream }} - with: - push: ${{ inputs.push }} + run: | + NODE_VERSION=${{ matrix.node }} STREAM=${{ inputs.stream }} docker buildx bake --pull --no-cache --push From d1ed2a39713a9f44a44eb9fdd5cbd62953b3f639 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:33:54 +1300 Subject: [PATCH 04/21] Run through again with creds --- .github/workflows/build-pr.yml | 9 ++++----- .github/workflows/build-push.yml | 26 ++++++++++---------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 398b5f9..14fc46e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -22,12 +22,11 @@ jobs: - name: 🐋 Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: 🏗️ Build Docker image + - name: 🏗️ Build and push Docker image uses: docker/bake-action@v6 env: NODE_VERSION: ${{ matrix.node }} STREAM: ${{ env.stream }} - - - name: 🏗️ Build and push Docker image - run: | - NODE_VERSION=${{ matrix.node }} STREAM=${{ env.stream }} docker buildx bake --pull --no-cache + with: + pull: true + no-cache: true diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index b0aa554..3e2ff3a 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -3,18 +3,10 @@ name: 🏗️ Build and Push on: workflow_call: inputs: - runs_on: - type: string - default: ubuntu-latest - description: The image to run the jobs. stream: type: string default: latest description: The stream to build (e.g latest or stable). - push: - type: boolean - default: false - description: Whether to push the built image to the registry. secrets: DOCKERHUB_USERNAME: @@ -25,12 +17,7 @@ on: jobs: build: name: Build Docker image - runs-on: ${{ inputs.runs_on }} - permissions: - packages: write - contents: read - attestations: write - id-token: write + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -57,5 +44,12 @@ jobs: uses: docker/setup-buildx-action@v3 - name: 🏗️ Build and push Docker image - run: | - NODE_VERSION=${{ matrix.node }} STREAM=${{ inputs.stream }} docker buildx bake --pull --no-cache --push + uses: docker/bake-action@v6 + env: + NODE_VERSION: ${{ matrix.node }} + STREAM: ${{ env.stream }} + with: + push: true + pull: true + no-cache: true + github-token: ${{ secrets.GITHUB_TOKEN }} From 296de63e4aaf6acc95a0fee9e8e3a25968c6f8ae Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:35:20 +1300 Subject: [PATCH 05/21] Fixing the inputs from other build parts --- .github/workflows/build-pr.yml | 3 --- .github/workflows/build-push-latest.yml | 1 - .github/workflows/build-push-stable.yml | 1 - .github/workflows/build-push.yml | 3 --- 4 files changed, 8 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 14fc46e..b5e9cce 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,9 +16,6 @@ jobs: node: [ '20', '22', '24' ] steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: 🐋 Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/build-push-latest.yml b/.github/workflows/build-push-latest.yml index e49f3c2..9442eb4 100644 --- a/.github/workflows/build-push-latest.yml +++ b/.github/workflows/build-push-latest.yml @@ -13,5 +13,4 @@ jobs: uses: ./.github/workflows/build-push.yml with: stream: latest - push: true secrets: inherit diff --git a/.github/workflows/build-push-stable.yml b/.github/workflows/build-push-stable.yml index 3ddd240..9ad500d 100644 --- a/.github/workflows/build-push-stable.yml +++ b/.github/workflows/build-push-stable.yml @@ -13,5 +13,4 @@ jobs: uses: ./.github/workflows/build-push.yml with: stream: stable - push: true secrets: inherit diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 3e2ff3a..350f65f 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -24,9 +24,6 @@ jobs: node: [ '20', '22', '24' ] steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: 🔑 Login to Docker Hub uses: docker/login-action@v3 with: From c1bf40fbff4e8311b3d415218b9ecd3b3d41f74f Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:41:54 +1300 Subject: [PATCH 06/21] Attempting to pass through the github token --- .github/workflows/build-push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 350f65f..0fa8a55 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -13,6 +13,8 @@ on: required: true DOCKERHUB_TOKEN: required: true + GITHUB_TOKEN: + required: true jobs: build: @@ -44,7 +46,7 @@ jobs: uses: docker/bake-action@v6 env: NODE_VERSION: ${{ matrix.node }} - STREAM: ${{ env.stream }} + STREAM: ${{ inputs.stream }} with: push: true pull: true From 4ce5a766a9836b50785f1e3ab0f7ccf9c520febb Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:44:13 +1300 Subject: [PATCH 07/21] Revert that too --- .github/workflows/build-push.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 0fa8a55..e279b72 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -13,8 +13,6 @@ on: required: true DOCKERHUB_TOKEN: required: true - GITHUB_TOKEN: - required: true jobs: build: From 09969fb7c6c40f5aa1b91d31872142ba9cfe1518 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:48:51 +1300 Subject: [PATCH 08/21] Test without the sub workflow --- .github/workflows/build-push-latest.yml | 38 ++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-push-latest.yml b/.github/workflows/build-push-latest.yml index 9442eb4..f346c87 100644 --- a/.github/workflows/build-push-latest.yml +++ b/.github/workflows/build-push-latest.yml @@ -10,7 +10,37 @@ on: jobs: build: - uses: ./.github/workflows/build-push.yml - with: - stream: latest - secrets: inherit + name: Build Docker image + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + node: [ '20', '22', '24' ] + + steps: + - name: 🔑 Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: 🔑 Log in to the GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: 🐋 Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: 🏗️ Build and push Docker image + uses: docker/bake-action@v6 + env: + NODE_VERSION: ${{ matrix.node }} + STREAM: ${{ inputs.stream }} + with: + push: true + pull: true + no-cache: true + github-token: ${{ secrets.GITHUB_TOKEN }} From f9497a9c574bbda0bfe14e1b47cde0a7ca256e19 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:51:04 +1300 Subject: [PATCH 09/21] Using the build directly didn't work either --- .github/workflows/build-push-latest.yml | 38 +++---------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build-push-latest.yml b/.github/workflows/build-push-latest.yml index f346c87..9442eb4 100644 --- a/.github/workflows/build-push-latest.yml +++ b/.github/workflows/build-push-latest.yml @@ -10,37 +10,7 @@ on: jobs: build: - name: Build Docker image - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - node: [ '20', '22', '24' ] - - steps: - - name: 🔑 Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: 🔑 Log in to the GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: 🐋 Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: 🏗️ Build and push Docker image - uses: docker/bake-action@v6 - env: - NODE_VERSION: ${{ matrix.node }} - STREAM: ${{ inputs.stream }} - with: - push: true - pull: true - no-cache: true - github-token: ${{ secrets.GITHUB_TOKEN }} + uses: ./.github/workflows/build-push.yml + with: + stream: latest + secrets: inherit From 42400b99aba448a294c81a16dad939c14f3341c4 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:57:23 +1300 Subject: [PATCH 10/21] Try using local source --- .github/workflows/build-push.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index e279b72..5e44309 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -24,6 +24,9 @@ jobs: node: [ '20', '22', '24' ] steps: + - name: Checkout + uses: actions/checkout@v5 + - name: 🔑 Login to Docker Hub uses: docker/login-action@v3 with: @@ -46,6 +49,7 @@ jobs: NODE_VERSION: ${{ matrix.node }} STREAM: ${{ inputs.stream }} with: + source: . push: true pull: true no-cache: true From dbae24963683fc4ad80f9e175e4fd9b387528018 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 20:53:07 +1300 Subject: [PATCH 11/21] Running a PR test --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index b5e9cce..1a6899d 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -26,4 +26,4 @@ jobs: STREAM: ${{ env.stream }} with: pull: true - no-cache: true + no-cache: true \ No newline at end of file From 05f157c67efddc8464fce425d39043af7d1f15a5 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:22:11 +1300 Subject: [PATCH 12/21] Attempting a run with login --- .github/workflows/build-pr.yml | 18 +++++++++++++++++- .github/workflows/build-push.yml | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 1a6899d..0d59f66 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,6 +16,19 @@ jobs: node: [ '20', '22', '24' ] steps: + - name: 🔑 Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: 🔑 Log in to the GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: 🐋 Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -24,6 +37,9 @@ jobs: env: NODE_VERSION: ${{ matrix.node }} STREAM: ${{ env.stream }} +<<<<<<< Updated upstream with: pull: true - no-cache: true \ No newline at end of file + no-cache: true +======= +>>>>>>> Stashed changes diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 5e44309..0336a23 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -51,6 +51,3 @@ jobs: with: source: . push: true - pull: true - no-cache: true - github-token: ${{ secrets.GITHUB_TOKEN }} From e745818beba5c1986d9b04df12ab763c20c41ad8 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:23:13 +1300 Subject: [PATCH 13/21] Fixing conflict --- .github/workflows/build-pr.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 0d59f66..5557bfe 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -37,9 +37,6 @@ jobs: env: NODE_VERSION: ${{ matrix.node }} STREAM: ${{ env.stream }} -<<<<<<< Updated upstream with: pull: true no-cache: true -======= ->>>>>>> Stashed changes From ad8f1a0e31bb787df6d3138632724a6f97d3065f Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:28:41 +1300 Subject: [PATCH 14/21] Attempt to use the workflow_call --- .github/workflows/build-pr.yml | 70 +++++++++++++++++--------------- .github/workflows/build-push.yml | 4 ++ 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 5557bfe..b8b1d28 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -8,35 +8,41 @@ env: jobs: build: - name: Build Docker image - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - node: [ '20', '22', '24' ] - - steps: - - name: 🔑 Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: 🔑 Log in to the GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: 🐋 Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: 🏗️ Build and push Docker image - uses: docker/bake-action@v6 - env: - NODE_VERSION: ${{ matrix.node }} - STREAM: ${{ env.stream }} - with: - pull: true - no-cache: true + uses: ./.github/workflows/build-push.yml + with: + stream: latest + push: false + secrets: inherit +# build: +# name: Build Docker image +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# node: [ '20', '22', '24' ] +# +# steps: +# - name: 🔑 Login to Docker Hub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} +# +# - name: 🔑 Log in to the GitHub Container Registry +# uses: docker/login-action@v3 +# with: +# registry: ghcr.io +# username: ${{ github.actor }} +# password: ${{ secrets.GITHUB_TOKEN }} +# +# - name: 🐋 Set up Docker Buildx +# uses: docker/setup-buildx-action@v3 +# +# - name: 🏗️ Build and push Docker image +# uses: docker/bake-action@v6 +# env: +# NODE_VERSION: ${{ matrix.node }} +# STREAM: ${{ env.stream }} +# with: +# pull: true +# no-cache: true diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 0336a23..a61da92 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -7,6 +7,10 @@ on: type: string default: latest description: The stream to build (e.g latest or stable). + push: + type: boolean + default: true + description: Push the images up to the container registries. secrets: DOCKERHUB_USERNAME: From 65bc271342e5f865b3899c5b3d78817f307e348b Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:33:23 +1300 Subject: [PATCH 15/21] Actually use the push value --- .github/workflows/build-push.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index a61da92..bc055d9 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -53,5 +53,4 @@ jobs: NODE_VERSION: ${{ matrix.node }} STREAM: ${{ inputs.stream }} with: - source: . - push: true + push: ${{ inputs.push }} From 2bbb93bd12b7b9e5c7bd8449cbc7b8ba6201b236 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:36:58 +1300 Subject: [PATCH 16/21] Don't do the checkout --- .github/workflows/build-push.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index bc055d9..8cfd99a 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -28,9 +28,6 @@ jobs: node: [ '20', '22', '24' ] steps: - - name: Checkout - uses: actions/checkout@v5 - - name: 🔑 Login to Docker Hub uses: docker/login-action@v3 with: From ff9696769812937928ba7427610a01826f922ff0 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:44:25 +1300 Subject: [PATCH 17/21] Environment needs updates --- .github/workflows/build-pr.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index b8b1d28..26a3cb0 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -3,14 +3,11 @@ name: 🏗️ Build PR on: pull_request: ~ -env: - stream: "pr-${{ github.event.pull_request.number }}" - jobs: build: uses: ./.github/workflows/build-push.yml with: - stream: latest + stream: "pr-${{ github.event.pull_request.number }}" push: false secrets: inherit # build: From 5ba99ab7dbec106ce404ecadaf9ac0b52c4dec3a Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 21:51:34 +1300 Subject: [PATCH 18/21] Try again --- .github/workflows/build-pr.yml | 33 -------------------------------- .github/workflows/build-push.yml | 3 +++ 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 26a3cb0..ef81458 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -10,36 +10,3 @@ jobs: stream: "pr-${{ github.event.pull_request.number }}" push: false secrets: inherit -# build: -# name: Build Docker image -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# node: [ '20', '22', '24' ] -# -# steps: -# - name: 🔑 Login to Docker Hub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} -# -# - name: 🔑 Log in to the GitHub Container Registry -# uses: docker/login-action@v3 -# with: -# registry: ghcr.io -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} -# -# - name: 🐋 Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 -# -# - name: 🏗️ Build and push Docker image -# uses: docker/bake-action@v6 -# env: -# NODE_VERSION: ${{ matrix.node }} -# STREAM: ${{ env.stream }} -# with: -# pull: true -# no-cache: true diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 8cfd99a..02d2a67 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -28,6 +28,9 @@ jobs: node: [ '20', '22', '24' ] steps: + - name: Checkout + uses: actions/checkout@v4 + - name: 🔑 Login to Docker Hub uses: docker/login-action@v3 with: From 3928f218635697b599a96df95b04e4be1ccf3b40 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 22:03:11 +1300 Subject: [PATCH 19/21] Adding a push --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index ef81458..32343b8 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -8,5 +8,5 @@ jobs: uses: ./.github/workflows/build-push.yml with: stream: "pr-${{ github.event.pull_request.number }}" - push: false + push: true secrets: inherit From adf29ecef603e08d0f5430384f681ff4e5aa4fd1 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 22:04:15 +1300 Subject: [PATCH 20/21] No checkout first --- .github/workflows/build-push.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 02d2a67..8cfd99a 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -28,9 +28,6 @@ jobs: node: [ '20', '22', '24' ] steps: - - name: Checkout - uses: actions/checkout@v4 - - name: 🔑 Login to Docker Hub uses: docker/login-action@v3 with: From 90414fd07ea8aa96fa9d20bc691584a9c2a89843 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Fri, 31 Oct 2025 22:15:15 +1300 Subject: [PATCH 21/21] Target the run state in the build --- docker-bake.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-bake.hcl b/docker-bake.hcl index 7975dd2..ea95c96 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -42,6 +42,7 @@ group "default" { target "prod" { inherits = ["_common"] context = "." + target = "run" contexts = { from_image = "docker-image://node:${NODE_VERSION}-alpine${ALPINE_VERSION}"