Skip to content

Commit b482168

Browse files
yunnysunnyyunnysunny
committed
ci: fix acr registry url
1 parent fdd1781 commit b482168

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

‎.github/workflows/debian.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ env:
2121
# ACR_PASSWORD: ACR密码或AccessKey Secret
2222
ACR_REGISTRY: ${{ vars.ACR_REGISTRY || 'registry.cn-hangzhou.aliyuncs.com' }}
2323
ACR_NAMESPACE: ${{ vars.ACR_NAMESPACE }}
24+
ACR_REPOSITORY: ${{ vars.ACR_REPOSITORY || 'node' }}
2425

2526
jobs:
2627
generate-matrix:
@@ -106,7 +107,7 @@ jobs:
106107
uses: docker/metadata-action@v4
107108
with:
108109
images: |
109-
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}
110+
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}
110111
tags: |
111112
type=semver,pattern={{version}},value=node-${{matrix.node-version}}
112113
type=semver,pattern={{major}}.{{minor}},value=node-${{matrix.node-version}}
@@ -123,7 +124,7 @@ jobs:
123124
uses: docker/metadata-action@v4
124125
with:
125126
images: |
126-
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}
127+
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}
127128
tags: |
128129
type=semver,pattern={{version}},value=node-compiler-${{matrix.node-version}}
129130
type=semver,pattern={{major}}.{{minor}},value=node-compiler-${{matrix.node-version}}
@@ -137,7 +138,7 @@ jobs:
137138
uses: docker/metadata-action@v4
138139
with:
139140
images: |
140-
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}
141+
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}
141142
tags: |
142143
type=semver,pattern={{version}},value=node-xtransit-${{matrix.node-version}}
143144
type=semver,pattern={{major}}.{{minor}},value=node-xtransit-${{matrix.node-version}}
@@ -151,7 +152,7 @@ jobs:
151152
uses: docker/metadata-action@v4
152153
with:
153154
images: |
154-
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}
155+
${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}
155156
tags: |
156157
type=semver,pattern={{version}},value=node-easy-monitor-${{matrix.node-version}}
157158
type=semver,pattern={{major}}.{{minor}},value=node-easy-monitor-${{matrix.node-version}}
@@ -262,8 +263,8 @@ jobs:
262263
tags: ${{ steps.meta-core-acr.outputs.tags }}
263264
labels: ${{ steps.meta-core-acr.outputs.labels }}
264265
target: core
265-
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:node-buildcache-${{matrix.major-version}}
266-
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:node-buildcache-${{matrix.major-version}},mode=max
266+
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:node-buildcache-${{matrix.major-version}}
267+
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:node-buildcache-${{matrix.major-version}},mode=max
267268
build-args: |
268269
NODE_VERSION=${{matrix.node-version}}
269270
- name: Build and push compiler
@@ -292,8 +293,8 @@ jobs:
292293
tags: ${{ steps.meta-compiler-acr.outputs.tags }}
293294
labels: ${{ steps.meta-compiler-acr.outputs.labels }}
294295
target: compiler
295-
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:node-compiler-buildcache-${{matrix.major-version}}
296-
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:node-compiler-buildcache-${{matrix.major-version}},mode=max
296+
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:node-compiler-buildcache-${{matrix.major-version}}
297+
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:node-compiler-buildcache-${{matrix.major-version}},mode=max
297298
build-args: |
298299
NODE_VERSION=${{matrix.node-version}}
299300
- name: Build and push easy-monitor
@@ -322,8 +323,8 @@ jobs:
322323
tags: ${{ steps.meta-easy-monitor-acr.outputs.tags }}
323324
labels: ${{ steps.meta-easy-monitor-acr.outputs.labels }}
324325
target: ezm-runtime
325-
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:easy-monitor-buildcache-${{matrix.major-version}}
326-
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:easy-monitor-buildcache-${{matrix.major-version}},mode=max
326+
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:easy-monitor-buildcache-${{matrix.major-version}}
327+
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:easy-monitor-buildcache-${{matrix.major-version}},mode=max
327328
build-args: |
328329
NODE_VERSION=${{matrix.node-version}}
329330
- name: Build and push xtransit
@@ -352,8 +353,8 @@ jobs:
352353
tags: ${{ steps.meta-xtransit-acr.outputs.tags }}
353354
labels: ${{ steps.meta-xtransit-acr.outputs.labels }}
354355
target: xtransit
355-
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:node-xtransit-buildcache-${{matrix.major-version}}
356-
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}:node-xtransit-buildcache-${{matrix.major-version}},mode=max
356+
cache-from: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:node-xtransit-buildcache-${{matrix.major-version}}
357+
cache-to: type=registry,ref=${{ env.ACR_REGISTRY }}/${{ env.ACR_NAMESPACE }}/${{ env.ACR_REPOSITORY }}:node-xtransit-buildcache-${{matrix.major-version}},mode=max
357358
build-args: |
358359
NODE_VERSION=${{matrix.node-version}}
359360
- name: Update core description

0 commit comments

Comments
 (0)