From 99028e8eacc812403f3f1b266d6db911211973de Mon Sep 17 00:00:00 2001 From: Tim Brust Date: Thu, 16 Jan 2025 08:36:41 +0000 Subject: [PATCH 1/4] fix: buildx syntax --- .github/workflows/buildx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 7c4f85d..1ba9f30 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -46,7 +46,7 @@ jobs: DOCKER_IMAGE=timbru31/ruby-node VERSION="${{ matrix.ruby-version }}" NODE_CODENAME=${{ steps.nodename.outputs.codename }} - VARIANT="${{ matrix.variant != 'default' && '-${{ matrix.variant }}' || '' }}" + VARIANT="${{ matrix.variant == 'default' && '' || concat('-', matrix.variant) }}" TAGS="${DOCKER_IMAGE}:${VERSION}${VARIANT}-${{ matrix.node-version }}" TAGS="${TAGS},${DOCKER_IMAGE}:${VERSION}${VARIANT}-${NODE_CODENAME}" if [ "${{ matrix.ruby-version }}" = "3.4" ] && [ "${{ matrix.node-version }}" = "22" ]; then From 394aa92d27bd53010cc612f840895d64bfb468d2 Mon Sep 17 00:00:00 2001 From: Tim Brust Date: Thu, 16 Jan 2025 08:38:28 +0000 Subject: [PATCH 2/4] fix: syntax --- .github/workflows/buildx.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 1ba9f30..6f17adc 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -46,7 +46,11 @@ jobs: DOCKER_IMAGE=timbru31/ruby-node VERSION="${{ matrix.ruby-version }}" NODE_CODENAME=${{ steps.nodename.outputs.codename }} - VARIANT="${{ matrix.variant == 'default' && '' || concat('-', matrix.variant) }}" + if [ "${{ matrix.variant }}" = "default" ]; then + VARIANT="" + else + VARIANT="-${{ matrix.variant }}" + fi TAGS="${DOCKER_IMAGE}:${VERSION}${VARIANT}-${{ matrix.node-version }}" TAGS="${TAGS},${DOCKER_IMAGE}:${VERSION}${VARIANT}-${NODE_CODENAME}" if [ "${{ matrix.ruby-version }}" = "3.4" ] && [ "${{ matrix.node-version }}" = "22" ]; then From e36b0b3db63df6be1b197c03071ed961c1daa36d Mon Sep 17 00:00:00 2001 From: Tim Brust Date: Thu, 16 Jan 2025 09:01:46 +0000 Subject: [PATCH 3/4] fix: context --- .github/workflows/buildx.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 6f17adc..db13f59 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -77,10 +77,12 @@ jobs: - name: Docker Buildx (build) uses: docker/build-push-action@v6.11.0 + env: + BUILD_PATH: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant == 'default' && '' || '/${{ matrix.variant }}' }} if: success() && !contains(github.ref, 'master') with: push: false - context: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }} + context: ${{ env.BUILD_PATH }} file: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}/Dockerfile build-args: REFRESHED_AT=$(date +%Y-%m-%d) platforms: ${{ matrix.platforms }} @@ -95,10 +97,12 @@ jobs: - name: Docker Buildx (push) uses: docker/build-push-action@v6.11.0 + env: + BUILD_PATH: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant == 'default' && '' || '/${{ matrix.variant }}' }} if: success() && github.event_name != 'pull_request' && contains(github.ref, 'master') with: push: true - context: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }} + context: ${{ env.BUILD_PATH }} file: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}/Dockerfile build-args: REFRESHED_AT=$(date +%Y-%m-%d) platforms: ${{ matrix.platforms }} From 0f0401dcf535d14f469d07b492f1c6e91e206978 Mon Sep 17 00:00:00 2001 From: Tim Brust Date: Thu, 16 Jan 2025 09:11:15 +0000 Subject: [PATCH 4/4] fix: syntax --- .github/workflows/buildx.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 5d3a4c9..dfd108f 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -75,15 +75,22 @@ jobs: with: install: true + - name: Set build path + id: buildpath + run: | + if [ "${{ matrix.variant }}" = "default" ]; then + echo "path=./${{ matrix.ruby-version }}/${{ matrix.node-version }}" >> $GITHUB_OUTPUT + else + echo "path=./${{ matrix.ruby-version }}/${{ matrix.node-version }}/${{ matrix.variant }}" >> $GITHUB_OUTPUT + fi + - name: Docker Buildx (build) uses: docker/build-push-action@v6.12.0 - env: - BUILD_PATH: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant == 'default' && '' || '/${{ matrix.variant }}' }} if: success() && !contains(github.ref, 'master') with: push: false - context: ${{ env.BUILD_PATH }} - file: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}/Dockerfile + context: ${{ steps.buildpath.outputs.path }} + file: ${{ steps.buildpath.outputs.path }}/Dockerfile build-args: REFRESHED_AT=$(date +%Y-%m-%d) platforms: ${{ matrix.platforms }} tags: ${{ steps.prepare.outputs.tags }} @@ -97,13 +104,11 @@ jobs: - name: Docker Buildx (push) uses: docker/build-push-action@v6.12.0 - env: - BUILD_PATH: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant == 'default' && '' || '/${{ matrix.variant }}' }} if: success() && github.event_name != 'pull_request' && contains(github.ref, 'master') with: push: true - context: ${{ env.BUILD_PATH }} - file: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}/Dockerfile + context: ${{ steps.buildpath.outputs.path }} + file: ${{ steps.buildpath.outputs.path }}/Dockerfile build-args: REFRESHED_AT=$(date +%Y-%m-%d) platforms: ${{ matrix.platforms }} tags: ${{ steps.prepare.outputs.tags }}