Skip to content

Commit 6538ca4

Browse files
stoneshi-yunifystoneshi-yunify
committed
fix action
Signed-off-by: stoneshi-yunify <[email protected]>
1 parent 8420516 commit 6538ca4

File tree

3 files changed

+0
-53
lines changed

3 files changed

+0
-53
lines changed

‎.github/actions/build/action.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@ runs:
5151
with:
5252
images: |
5353
kubespheredev/${{ inputs.image-name }}
54-
ghcr.io/${{ github.repository_owner }}/${{ inputs.image-name }}
55-
tags: |
56-
type=ref,event=branch,suffix=${{ inputs.tag-suffix }}
57-
type=ref,event=pr,suffix=${{ inputs.tag-suffix }}
58-
type=semver,pattern={{version}},prefix=v,suffix=${{ inputs.tag-suffix }}
59-
- name: Docker meta for Contributors
60-
id: metaContributors
61-
if: github.repository_owner != 'kubesphere'
62-
uses: docker/[email protected]
63-
with:
64-
images: |
65-
ghcr.io/${{ github.repository_owner }}/${{ inputs.image-name }}
6654
tags: |
6755
type=ref,event=branch,suffix=${{ inputs.tag-suffix }}
6856
type=ref,event=pr,suffix=${{ inputs.tag-suffix }}
@@ -78,13 +66,6 @@ runs:
7866
registry: ${{ inputs.docker-registry }}
7967
username: ${{ inputs.docker-namespace }}
8068
password: ${{ inputs.docker-password }}
81-
- name: Login to GHCR
82-
if: github.event_name != 'pull_request'
83-
uses: docker/login-action@v1
84-
with:
85-
registry: ghcr.io
86-
username: ${{ github.repository_owner }}
87-
password: ${{ inputs.ghcr-token }}
8869
- name: Build and push Docker images
8970
uses: docker/build-push-action@v2
9071
if: github.repository_owner == 'kubesphere'
@@ -96,14 +77,3 @@ runs:
9677
labels: ${{ steps.meta.outputs.labels }}
9778
platforms: ${{ inputs.platforms }}
9879
build-args: ${{ inputs.build-args }}
99-
- name: Build and push Docker images for Contributors
100-
uses: docker/build-push-action@v2
101-
if: github.repository_owner != 'kubesphere'
102-
with:
103-
context: ${{ inputs.context }}
104-
file: ${{ inputs.dockerfile }}
105-
tags: ${{ steps.metaContributors.outputs.tags }}
106-
push: ${{ github.event_name != 'pull_request' }}
107-
labels: ${{ steps.metaContributors.outputs.labels }}
108-
platforms: ${{ inputs.platforms }}
109-
build-args: ${{ inputs.build-args }}

‎.github/workflows/build-podman.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
platforms: linux/amd64,linux/arm64
2424
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
2525
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
26-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
2726

2827
BuildGo:
2928
needs: BuildBase
@@ -40,7 +39,6 @@ jobs:
4039
platforms: linux/amd64,linux/arm64
4140
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
4241
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
43-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
4442
build-args: "GOLANG_VERSION=1.12.10"
4543
BuildGo16:
4644
needs: BuildBase
@@ -57,7 +55,6 @@ jobs:
5755
platforms: linux/amd64,linux/arm64
5856
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
5957
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
60-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
6158
build-args: "GOLANG_VERSION=1.16.8"
6259
BuildGo17:
6360
needs: BuildBase
@@ -74,7 +71,6 @@ jobs:
7471
platforms: linux/amd64,linux/arm64
7572
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
7673
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
77-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
7874
build-args: "GOLANG_VERSION=1.17.8"
7975
BuildGo18:
8076
needs: BuildBase
@@ -91,7 +87,6 @@ jobs:
9187
platforms: linux/amd64,linux/arm64
9288
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
9389
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
94-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
9590
build-args: "GOLANG_VERSION=1.18"
9691

9792
BuildMaven:
@@ -109,7 +104,6 @@ jobs:
109104
platforms: linux/amd64,linux/arm64
110105
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
111106
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
112-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
113107
build-args: "JDK_VERSION=1.8.0"
114108
BuildMavenJDK11:
115109
needs: BuildBase
@@ -126,7 +120,6 @@ jobs:
126120
platforms: linux/amd64,linux/arm64
127121
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
128122
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
129-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
130123
build-args: "JDK_VERSION=11"
131124

132125
BuildMavenJDK17:
@@ -144,7 +137,6 @@ jobs:
144137
platforms: linux/amd64,linux/arm64
145138
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
146139
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
147-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
148140
build-args: |
149141
"JDK_VERSION=17"
150142
"JDK_HOME=/usr/java/default"
@@ -164,7 +156,6 @@ jobs:
164156
platforms: linux/amd64,linux/arm64
165157
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
166158
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
167-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
168159

169160
BuildNodeJs:
170161
needs: BuildBase
@@ -181,7 +172,6 @@ jobs:
181172
platforms: linux/amd64,linux/arm64
182173
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
183174
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
184-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
185175

186176
BuildPython:
187177
needs: BuildBase
@@ -198,4 +188,3 @@ jobs:
198188
platforms: linux/amd64,linux/arm64
199189
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
200190
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
201-
ghcr-token: ${{ secrets.GHCR_TOKEN }}

‎.github/workflows/build.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
platforms: linux/amd64,linux/arm64
2323
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
2424
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
25-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
2625

2726
BuildGo:
2827
needs: BuildBase
@@ -38,7 +37,6 @@ jobs:
3837
platforms: linux/amd64,linux/arm64
3938
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
4039
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
41-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
4240
build-args: "GOLANG_VERSION=1.12.10"
4341
BuildGo16:
4442
needs: BuildBase
@@ -55,7 +53,6 @@ jobs:
5553
platforms: linux/amd64,linux/arm64
5654
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
5755
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
58-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
5956
build-args: "GOLANG_VERSION=1.16.8"
6057
BuildGo17:
6158
needs: BuildBase
@@ -72,7 +69,6 @@ jobs:
7269
platforms: linux/amd64,linux/arm64
7370
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
7471
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
75-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
7672
build-args: "GOLANG_VERSION=1.17.8"
7773
BuildGo18:
7874
needs: BuildBase
@@ -89,7 +85,6 @@ jobs:
8985
platforms: linux/amd64,linux/arm64
9086
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
9187
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
92-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
9388
build-args: "GOLANG_VERSION=1.18"
9489

9590
BuildMaven:
@@ -106,7 +101,6 @@ jobs:
106101
platforms: linux/amd64,linux/arm64
107102
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
108103
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
109-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
110104
build-args: "JDK_VERSION=1.8.0"
111105
BuildMavenJDK11:
112106
needs: BuildBase
@@ -123,7 +117,6 @@ jobs:
123117
platforms: linux/amd64,linux/arm64
124118
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
125119
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
126-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
127120
build-args: "JDK_VERSION=11"
128121
BuildMavenJDK17:
129122
needs: BuildBase
@@ -140,7 +133,6 @@ jobs:
140133
platforms: linux/amd64,linux/arm64
141134
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
142135
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
143-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
144136
build-args: |
145137
"JDK_VERSION=17"
146138
"JDK_HOME=/usr/java/default"
@@ -159,7 +151,6 @@ jobs:
159151
platforms: linux/amd64,linux/arm64
160152
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
161153
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
162-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
163154

164155
BuildNodeJs:
165156
needs: BuildBase
@@ -175,7 +166,6 @@ jobs:
175166
platforms: linux/amd64,linux/arm64
176167
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
177168
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
178-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
179169

180170
BuildDotnet:
181171
needs: BuildBase
@@ -191,7 +181,6 @@ jobs:
191181
platforms: linux/amd64,linux/arm64
192182
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
193183
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
194-
ghcr-token: ${{ secrets.GHCR_TOKEN }}
195184

196185
BuildPython:
197186
needs: BuildBase
@@ -207,4 +196,3 @@ jobs:
207196
platforms: linux/amd64,linux/arm64
208197
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
209198
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
210-
ghcr-token: ${{ secrets.GHCR_TOKEN }}

0 commit comments

Comments
 (0)