Skip to content

Commit 7fbc49d

Browse files
committed
fix: new ci pipeline failure
1 parent d360ee2 commit 7fbc49d

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

.github/workflows/images.build.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
id: release
4646
run: |
4747
if [ "${{ github.event_name }}" = "release" ]; then
48-
VERSION=$(echo "${GITHUB_REF#refs/*/}" | sed 's/^v//')
48+
REF_NAME="${GITHUB_REF#refs/*/}"
49+
VERSION="${REF_NAME#v}"
4950
echo "release_version=${VERSION}" >> "$GITHUB_OUTPUT"
5051
if [ "${{ github.event.release.prerelease }}" = "true" ]; then
5152
echo "publish_latest=false" >> "$GITHUB_OUTPUT"
@@ -150,28 +151,28 @@ jobs:
150151
151152
- name: Build and push (dev)
152153
if: needs.prepare.outputs.channel == 'dev'
153-
uses: docker/bake-action@v6
154+
uses: docker/bake-action@v7
154155
with:
155-
files: docker-bake.hcl
156+
files: |
157+
docker-bake.hcl
158+
cwd://${{ steps.meta_dev.outputs.bake-file }}
156159
targets: ${{ matrix.target }}
157160
push: true
158161
set: |
159162
conduit-base.args.BUILDING_SERVICE=${{ matrix.building_service }}
160-
*.tags=${{ steps.meta_dev.outputs.tags }}
161-
*.labels=${{ steps.meta_dev.outputs.labels }}
162163
*.cache-from=type=gha,scope=${{ matrix.target }}
163164
*.cache-to=type=gha,mode=max,scope=${{ matrix.target }}
164165
165166
- name: Build and push (release)
166167
if: needs.prepare.outputs.channel == 'release'
167-
uses: docker/bake-action@v6
168+
uses: docker/bake-action@v7
168169
with:
169-
files: docker-bake.hcl
170+
files: |
171+
docker-bake.hcl
172+
cwd://${{ steps.meta_release.outputs.bake-file }}
170173
targets: ${{ matrix.target }}
171174
push: true
172175
set: |
173176
conduit-base.args.BUILDING_SERVICE=${{ matrix.building_service }}
174-
*.tags=${{ steps.meta_release.outputs.tags }}
175-
*.labels=${{ steps.meta_release.outputs.labels }}
176177
*.cache-from=type=gha,scope=${{ matrix.target }}
177178
*.cache-to=type=gha,mode=max,scope=${{ matrix.target }}

docker-bake.hcl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ variable "BUILDING_SERVICE" {
66
default = ""
77
}
88

9+
target "docker-metadata-action" {}
10+
911
target "_platforms" {
1012
platforms = PLATFORMS
1113
}
@@ -29,7 +31,7 @@ target "conduit-builder" {
2931
}
3032

3133
target "_runtime" {
32-
inherits = ["_platforms"]
34+
inherits = ["_platforms", "docker-metadata-action"]
3335
contexts = {
3436
conduit-base = "target:conduit-base"
3537
conduit-builder = "target:conduit-builder"
@@ -91,7 +93,7 @@ target "storage" {
9193
}
9294

9395
target "conduit-standalone" {
94-
inherits = ["_platforms"]
96+
inherits = ["_platforms", "docker-metadata-action"]
9597
context = "."
9698
dockerfile = "standalone.Dockerfile"
9799
contexts = {

0 commit comments

Comments
 (0)