浏览代码

Merge pull request #2106 from chipitsine/master

CI: docker: fix tags
Ilya Shipitsin 8 月之前
父节点
当前提交
48042cfbc1
共有 1 个文件被更改,包括 9 次插入9 次删除
  1. 9 9
      .github/workflows/docker-aio.yml

+ 9 - 9
.github/workflows/docker-aio.yml

@@ -20,7 +20,7 @@ jobs:
         id: metavpnserver
         id: metavpnserver
         uses: docker/metadata-action@v5
         uses: docker/metadata-action@v5
         with:
         with:
-          images: softethervpn/vpnserver
+          images: ${{ github.repository_owner }}/vpnserver
           tags: |
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=pr
             type=ref,event=pr
@@ -31,7 +31,7 @@ jobs:
         id: metavpnclient
         id: metavpnclient
         uses: docker/metadata-action@v5
         uses: docker/metadata-action@v5
         with:
         with:
-          images: softethervpn/vpnclient
+          images: ${{ github.repository_owner }}/vpnclient
           tags: |
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=pr
             type=ref,event=pr
@@ -42,7 +42,7 @@ jobs:
         id: metavpnbridge
         id: metavpnbridge
         uses: docker/metadata-action@v5
         uses: docker/metadata-action@v5
         with:
         with:
-          images: softethervpn/vpnbridge
+          images: ${{ github.repository_owner }}/vpnbridge
           tags: |
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=pr
             type=ref,event=pr
@@ -74,8 +74,8 @@ jobs:
           target: vpnserver
           target: vpnserver
           push: ${{ github.event_name != 'pull_request' }}
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.metavpnserver.outputs.tags }}
+          labels: ${{ steps.metavpnserver.outputs.labels }}
       -
       -
         name: Build and push vpnclient
         name: Build and push vpnclient
         uses: docker/build-push-action@v6
         uses: docker/build-push-action@v6
@@ -84,8 +84,8 @@ jobs:
           target: vpnclient
           target: vpnclient
           push: ${{ github.event_name != 'pull_request' }}
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.metavpnclient.outputs.tags }}
+          labels: ${{ steps.metavpnclient.outputs.labels }}
       -
       -
         name: Build and push vpnbridge
         name: Build and push vpnbridge
         uses: docker/build-push-action@v6
         uses: docker/build-push-action@v6
@@ -94,5 +94,5 @@ jobs:
           target: vpnbridge
           target: vpnbridge
           push: ${{ github.event_name != 'pull_request' }}
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.metavpnbridge.outputs.tags }}
+          labels: ${{ steps.metavpnbridge.outputs.labels }}