Skip to content

Commit aa264a5

Browse files
stoneshi-yunifystoneshi-yunify
authored
Merge pull request #71 from stoneshi-yunify/master
change base image to ubuntu
2 parents ebac872 + 4ff051e commit aa264a5

File tree

84 files changed

+202
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+202
-566
lines changed

‎.github/workflows/pull-request.yaml‎

Lines changed: 40 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,23 @@ on:
44
push:
55
branches:
66
- master
7-
- test-* # make it be easier for contributors to test
87
tags:
98
- 'v*.*.*'
109
pull_request:
1110
branches:
1211
- 'master'
1312

1413
jobs:
15-
BuildCentOSJava11:
16-
runs-on: ubuntu-20.04
14+
BuildUbuntuJava11:
15+
runs-on: ubuntu-latest
1716
steps:
18-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1918
- name: Docker meta for KubeSphere
2019
id: meta
21-
if: github.repository_owner == 'kubesphere'
22-
uses: docker/metadata-action@v3
20+
uses: docker/metadata-action@v5
2321
with:
2422
images: |
25-
kubespheredev/java-11-centos7
26-
ghcr.io/${{ github.repository_owner }}/java-11-centos7
27-
tags: |
28-
type=schedule
29-
type=ref,event=branch
30-
type=ref,event=pr
31-
type=semver,pattern=v{{version}}
32-
type=semver,pattern=v{{major}}.{{minor}}
33-
type=semver,pattern=v{{major}}
34-
type=sha
35-
- name: Docker meta for Contributors
36-
id: metaContributors
37-
if: github.repository_owner != 'kubesphere'
38-
uses: docker/metadata-action@v3
39-
with:
40-
images: |
41-
ghcr.io/${{ github.repository_owner }}/java-11-centos7
23+
kubespheredev/java-11-ubuntu
4224
tags: |
4325
type=schedule
4426
type=ref,event=branch
@@ -48,68 +30,34 @@ jobs:
4830
type=semver,pattern=v{{major}}
4931
type=sha
5032
- name: Set up QEMU
51-
uses: docker/setup-qemu-action@v1
33+
uses: docker/setup-qemu-action@v3
5234
- name: Set up Docker Buildx
53-
uses: docker/setup-buildx-action@v1
35+
uses: docker/setup-buildx-action@v3
5436
- name: Login to DockerHub
5537
if: github.event_name != 'pull_request'
56-
uses: docker/login-action@v1
38+
uses: docker/login-action@v3
5739
with:
5840
username: ${{ secrets.DOCKER_HUB_USER }}
5941
password: ${{ secrets.DOCKER_HUB_SECRETS }}
60-
- name: Login to GHCR
61-
if: github.event_name != 'pull_request'
62-
uses: docker/login-action@v1
63-
with:
64-
registry: ghcr.io
65-
username: ${{ github.repository_owner }}
66-
password: ${{ secrets.GHCR_TOKEN }}
6742
- name: Build and push Docker images
68-
uses: docker/[email protected]
69-
if: github.repository_owner == 'kubesphere'
43+
uses: docker/build-push-action@v6
7044
with:
71-
context: java/images/centos-java11
45+
context: java/images/ubuntu-java11
7246
tags: ${{ steps.meta.outputs.tags }}
7347
push: ${{ github.event_name != 'pull_request' }}
7448
labels: ${{ steps.meta.outputs.labels }}
7549
platforms: linux/amd64,linux/arm64
76-
- name: Build and push Docker images for Contributors
77-
uses: docker/[email protected]
78-
if: github.repository_owner != 'kubesphere'
79-
with:
80-
context: java/images/centos-java11
81-
tags: ${{ steps.metaContributors.outputs.tags }}
82-
push: ${{ github.event_name != 'pull_request' }}
83-
labels: ${{ steps.metaContributors.outputs.labels }}
84-
platforms: linux/amd64,linux/arm64
8550

86-
BuildCentOSJava8:
87-
runs-on: ubuntu-20.04
51+
BuildUbuntuJava8:
52+
runs-on: ubuntu-latest
8853
steps:
89-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v4
9055
- name: Docker meta for KubeSphere
9156
id: meta
92-
if: github.repository_owner == 'kubesphere'
93-
uses: docker/metadata-action@v3
57+
uses: docker/metadata-action@v5
9458
with:
9559
images: |
96-
kubespheredev/java-8-centos7
97-
ghcr.io/${{ github.repository_owner }}/java-8-centos7
98-
tags: |
99-
type=schedule
100-
type=ref,event=branch
101-
type=ref,event=pr
102-
type=semver,pattern=v{{version}}
103-
type=semver,pattern=v{{major}}.{{minor}}
104-
type=semver,pattern=v{{major}}
105-
type=sha
106-
- name: Docker meta for Contributors
107-
id: metaContributors
108-
if: github.repository_owner != 'kubesphere'
109-
uses: docker/metadata-action@v3
110-
with:
111-
images: |
112-
ghcr.io/${{ github.repository_owner }}/java-8-centos7
60+
kubespheredev/java-8-ubuntu
11361
tags: |
11462
type=schedule
11563
type=ref,event=branch
@@ -119,69 +67,35 @@ jobs:
11967
type=semver,pattern=v{{major}}
12068
type=sha
12169
- name: Set up QEMU
122-
uses: docker/setup-qemu-action@v1
70+
uses: docker/setup-qemu-action@v3
12371
- name: Set up Docker Buildx
124-
uses: docker/setup-buildx-action@v1
72+
uses: docker/setup-buildx-action@v3
12573
- name: Login to DockerHub
12674
if: github.event_name != 'pull_request'
127-
uses: docker/login-action@v1
75+
uses: docker/login-action@v3
12876
with:
12977
username: ${{ secrets.DOCKER_HUB_USER }}
13078
password: ${{ secrets.DOCKER_HUB_SECRETS }}
131-
- name: Login to GHCR
132-
if: github.event_name != 'pull_request'
133-
uses: docker/login-action@v1
134-
with:
135-
registry: ghcr.io
136-
username: ${{ github.repository_owner }}
137-
password: ${{ secrets.GHCR_TOKEN }}
13879
- name: Build and push Docker images
139-
uses: docker/[email protected]
140-
if: github.repository_owner == 'kubesphere'
80+
uses: docker/build-push-action@v6
14181
with:
142-
context: java/images/centos
82+
context: java/images/ubuntu
14383
tags: ${{ steps.meta.outputs.tags }}
14484
push: ${{ github.event_name != 'pull_request' }}
14585
labels: ${{ steps.meta.outputs.labels }}
14686
platforms: linux/amd64,linux/arm64
147-
- name: Build and push Docker images for Contributors
148-
uses: docker/[email protected]
149-
if: github.repository_owner != 'kubesphere'
150-
with:
151-
context: java/images/centos
152-
tags: ${{ steps.metaContributors.outputs.tags }}
153-
push: ${{ github.event_name != 'pull_request' }}
154-
labels: ${{ steps.metaContributors.outputs.labels }}
155-
platforms: linux/amd64,linux/arm64
15687

15788
BuildTomcatJava8:
158-
runs-on: ubuntu-20.04
159-
needs: BuildCentOSJava8
89+
runs-on: ubuntu-latest
90+
needs: BuildUbuntuJava8
16091
steps:
161-
- uses: actions/checkout@v2
92+
- uses: actions/checkout@v4
16293
- name: Docker meta for KubeSphere
16394
id: meta
164-
if: github.repository_owner == 'kubesphere'
165-
uses: docker/metadata-action@v3
95+
uses: docker/metadata-action@v5
16696
with:
16797
images: |
168-
kubespheredev/tomcat85-java8-centos7
169-
ghcr.io/${{ github.repository_owner }}/tomcat85-java8-centos7
170-
tags: |
171-
type=schedule
172-
type=ref,event=branch
173-
type=ref,event=pr
174-
type=semver,pattern=v{{version}}
175-
type=semver,pattern=v{{major}}.{{minor}}
176-
type=semver,pattern=v{{major}}
177-
type=sha
178-
- name: Docker meta for Contributors
179-
id: metaContributors
180-
if: github.repository_owner != 'kubesphere'
181-
uses: docker/metadata-action@v3
182-
with:
183-
images: |
184-
ghcr.io/${{ github.repository_owner }}/tomcat85-java8-centos7
98+
kubespheredev/tomcat85-java8-ubuntu
18599
tags: |
186100
type=schedule
187101
type=ref,event=branch
@@ -191,69 +105,35 @@ jobs:
191105
type=semver,pattern=v{{major}}
192106
type=sha
193107
- name: Set up QEMU
194-
uses: docker/setup-qemu-action@v1
108+
uses: docker/setup-qemu-action@v3
195109
- name: Set up Docker Buildx
196-
uses: docker/setup-buildx-action@v1
110+
uses: docker/setup-buildx-action@v3
197111
- name: Login to DockerHub
198112
if: github.event_name != 'pull_request'
199-
uses: docker/login-action@v1
113+
uses: docker/login-action@v3
200114
with:
201115
username: ${{ secrets.DOCKER_HUB_USER }}
202116
password: ${{ secrets.DOCKER_HUB_SECRETS }}
203-
- name: Login to GHCR
204-
if: github.event_name != 'pull_request'
205-
uses: docker/login-action@v1
206-
with:
207-
registry: ghcr.io
208-
username: ${{ github.repository_owner }}
209-
password: ${{ secrets.GHCR_TOKEN }}
210117
- name: Build and push Docker images
211-
uses: docker/[email protected]
212-
if: github.repository_owner == 'kubesphere'
118+
uses: docker/build-push-action@v6
213119
with:
214-
context: tomcat/images/tomcat85-java8-centos7
120+
context: tomcat/images/tomcat85-java8-ubuntu
215121
tags: ${{ steps.meta.outputs.tags }}
216122
push: ${{ github.event_name != 'pull_request' }}
217123
labels: ${{ steps.meta.outputs.labels }}
218124
platforms: linux/amd64,linux/arm64
219-
- name: Build and push Docker images for Contributors
220-
uses: docker/[email protected]
221-
if: github.repository_owner != 'kubesphere'
222-
with:
223-
context: tomcat/images/tomcat85-java8-centos7
224-
tags: ${{ steps.metaContributors.outputs.tags }}
225-
push: ${{ github.event_name != 'pull_request' }}
226-
labels: ${{ steps.metaContributors.outputs.labels }}
227-
platforms: linux/amd64,linux/arm64
228125

229126
BuildTomcatJava11:
230-
runs-on: ubuntu-20.04
231-
needs: BuildCentOSJava11
127+
runs-on: ubuntu-latest
128+
needs: BuildUbuntuJava11
232129
steps:
233-
- uses: actions/checkout@v2
130+
- uses: actions/checkout@v4
234131
- name: Docker meta for KubeSphere
235132
id: meta
236-
if: github.repository_owner == 'kubesphere'
237-
uses: docker/metadata-action@v3
133+
uses: docker/metadata-action@v5
238134
with:
239135
images: |
240-
kubespheredev/tomcat85-java11-centos7
241-
ghcr.io/${{ github.repository_owner }}/tomcat85-java11-centos7
242-
tags: |
243-
type=schedule
244-
type=ref,event=branch
245-
type=ref,event=pr
246-
type=semver,pattern=v{{version}}
247-
type=semver,pattern=v{{major}}.{{minor}}
248-
type=semver,pattern=v{{major}}
249-
type=sha
250-
- name: Docker meta for Contributors
251-
id: metaContributors
252-
if: github.repository_owner != 'kubesphere'
253-
uses: docker/metadata-action@v3
254-
with:
255-
images: |
256-
ghcr.io/${{ github.repository_owner }}/tomcat85-java11-centos7
136+
kubespheredev/tomcat85-java11-ubuntu
257137
tags: |
258138
type=schedule
259139
type=ref,event=branch
@@ -263,37 +143,20 @@ jobs:
263143
type=semver,pattern=v{{major}}
264144
type=sha
265145
- name: Set up QEMU
266-
uses: docker/setup-qemu-action@v1
146+
uses: docker/setup-qemu-action@v3
267147
- name: Set up Docker Buildx
268-
uses: docker/setup-buildx-action@v1
148+
uses: docker/setup-buildx-action@v3
269149
- name: Login to DockerHub
270150
if: github.event_name != 'pull_request'
271-
uses: docker/login-action@v1
151+
uses: docker/login-action@v3
272152
with:
273153
username: ${{ secrets.DOCKER_HUB_USER }}
274154
password: ${{ secrets.DOCKER_HUB_SECRETS }}
275-
- name: Login to GHCR
276-
if: github.event_name != 'pull_request'
277-
uses: docker/login-action@v1
278-
with:
279-
registry: ghcr.io
280-
username: ${{ github.repository_owner }}
281-
password: ${{ secrets.GHCR_TOKEN }}
282155
- name: Build and push Docker images
283-
uses: docker/[email protected]
284-
if: github.repository_owner == 'kubesphere'
156+
uses: docker/build-push-action@v6
285157
with:
286-
context: tomcat/images/tomcat85-java11-centos7
158+
context: tomcat/images/tomcat85-java11-ubuntu
287159
tags: ${{ steps.meta.outputs.tags }}
288160
push: ${{ github.event_name != 'pull_request' }}
289161
labels: ${{ steps.meta.outputs.labels }}
290162
platforms: linux/amd64,linux/arm64
291-
- name: Build and push Docker images for Contributors
292-
uses: docker/[email protected]
293-
if: github.repository_owner != 'kubesphere'
294-
with:
295-
context: tomcat/images/tomcat85-java11-centos7
296-
tags: ${{ steps.metaContributors.outputs.tags }}
297-
push: ${{ github.event_name != 'pull_request' }}
298-
labels: ${{ steps.metaContributors.outputs.labels }}
299-
platforms: linux/amd64,linux/arm64

‎.gitpod.Dockerfile‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.gitpod.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DEPRECATED: DO NOT UPDATE THIS FILE
12
# Changelog
23
All notable changes to this project will be documented in this file.
34

0 commit comments

Comments
 (0)