Skip to content

Commit 66db846

Browse files
authored
fix: buildx syntax (#729)
1 parent 320c95a commit 66db846

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

.github/workflows/buildx.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ jobs:
4646
DOCKER_IMAGE=timbru31/ruby-node
4747
VERSION="${{ matrix.ruby-version }}"
4848
NODE_CODENAME=${{ steps.nodename.outputs.codename }}
49-
VARIANT="${{ matrix.variant != 'default' && '-${{ matrix.variant }}' || '' }}"
49+
if [ "${{ matrix.variant }}" = "default" ]; then
50+
VARIANT=""
51+
else
52+
VARIANT="-${{ matrix.variant }}"
53+
fi
5054
TAGS="${DOCKER_IMAGE}:${VERSION}${VARIANT}-${{ matrix.node-version }}"
5155
TAGS="${TAGS},${DOCKER_IMAGE}:${VERSION}${VARIANT}-${NODE_CODENAME}"
5256
if [ "${{ matrix.ruby-version }}" = "3.4" ] && [ "${{ matrix.node-version }}" = "22" ]; then
@@ -71,13 +75,22 @@ jobs:
7175
with:
7276
install: true
7377

78+
- name: Set build path
79+
id: buildpath
80+
run: |
81+
if [ "${{ matrix.variant }}" = "default" ]; then
82+
echo "path=./${{ matrix.ruby-version }}/${{ matrix.node-version }}" >> $GITHUB_OUTPUT
83+
else
84+
echo "path=./${{ matrix.ruby-version }}/${{ matrix.node-version }}/${{ matrix.variant }}" >> $GITHUB_OUTPUT
85+
fi
86+
7487
- name: Docker Buildx (build)
7588
uses: docker/[email protected]
7689
if: success() && !contains(github.ref, 'master')
7790
with:
7891
push: false
79-
context: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}
80-
file: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}/Dockerfile
92+
context: ${{ steps.buildpath.outputs.path }}
93+
file: ${{ steps.buildpath.outputs.path }}/Dockerfile
8194
build-args: REFRESHED_AT=$(date +%Y-%m-%d)
8295
platforms: ${{ matrix.platforms }}
8396
tags: ${{ steps.prepare.outputs.tags }}
@@ -94,8 +107,8 @@ jobs:
94107
if: success() && github.event_name != 'pull_request' && contains(github.ref, 'master')
95108
with:
96109
push: true
97-
context: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}
98-
file: ./${{ matrix.ruby-version }}/${{ matrix.node-version }}${{ matrix.variant != 'default' && '/${{ matrix.variant }}' || '' }}/Dockerfile
110+
context: ${{ steps.buildpath.outputs.path }}
111+
file: ${{ steps.buildpath.outputs.path }}/Dockerfile
99112
build-args: REFRESHED_AT=$(date +%Y-%m-%d)
100113
platforms: ${{ matrix.platforms }}
101114
tags: ${{ steps.prepare.outputs.tags }}

0 commit comments

Comments
 (0)