Skip to content

Commit 538837f

Browse files
PhineasePhinease
authored
🔨 Modify the image name and delete unnecessary files. #702 
2 parents 80c88d0 + 8152aa1 commit 538837f

File tree

21 files changed

+116
-149
lines changed

21 files changed

+116
-149
lines changed

‎.github/workflows/docker-build-push-beta.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
uses: actions/checkout@v4
2727
- name: Build main image (amd64) and load locally
2828
run: |
29-
docker buildx build --platform linux/amd64 -t nexent/nexent-commercial:beta-amd64 --load -f make/main/Dockerfile .
29+
docker buildx build --platform linux/amd64 -t nexent/nexent:beta-amd64 --load -f make/main/Dockerfile .
3030
- name: Login to DockerHub
3131
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
3232
- name: Push main image (amd64) to DockerHub
33-
run: docker push nexent/nexent-commercial:beta-amd64
33+
run: docker push nexent/nexent:beta-amd64
3434

3535
build-and-push-main-arm64:
3636
runs-on: ubuntu-latest
@@ -46,11 +46,11 @@ jobs:
4646
uses: actions/checkout@v4
4747
- name: Build main image (arm64) and load locally
4848
run: |
49-
docker buildx build --platform linux/arm64 -t nexent/nexent-commercial:beta-arm64 --load -f make/main/Dockerfile .
49+
docker buildx build --platform linux/arm64 -t nexent/nexent:beta-arm64 --load -f make/main/Dockerfile .
5050
- name: Login to DockerHub
5151
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
5252
- name: Push main image (arm64) to DockerHub
53-
run: docker push nexent/nexent-commercial:beta-arm64
53+
run: docker push nexent/nexent:beta-arm64
5454

5555
build-and-push-data-process-amd64:
5656
runs-on: ubuntu-latest
@@ -75,11 +75,11 @@ jobs:
7575
rm -rf .git .gitattributes
7676
- name: Build data process image (amd64) and load locally
7777
run: |
78-
docker buildx build --platform linux/amd64 -t nexent/nexent-data-process-commercial:beta-amd64 --load -f make/data_process/Dockerfile .
78+
docker buildx build --platform linux/amd64 -t nexent/nexent-data-process:beta-amd64 --load -f make/data_process/Dockerfile .
7979
- name: Login to DockerHub
8080
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
8181
- name: Push data process image (amd64) to DockerHub
82-
run: docker push nexent/nexent-data-process-commercial:beta-amd64
82+
run: docker push nexent/nexent-data-process:beta-amd64
8383

8484
build-and-push-data-process-arm64:
8585
runs-on: ubuntu-latest
@@ -104,11 +104,11 @@ jobs:
104104
rm -rf .git .gitattributes
105105
- name: Build data process image (arm64) and load locally
106106
run: |
107-
docker buildx build --platform linux/arm64 -t nexent/nexent-data-process-commercial:beta-arm64 --load -f make/data_process/Dockerfile .
107+
docker buildx build --platform linux/arm64 -t nexent/nexent-data-process:beta-arm64 --load -f make/data_process/Dockerfile .
108108
- name: Login to DockerHub
109109
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
110110
- name: Push data process image (arm64) to DockerHub
111-
run: docker push nexent/nexent-data-process-commercial:beta-arm64
111+
run: docker push nexent/nexent-data-process:beta-arm64
112112

113113
build-and-push-web-amd64:
114114
runs-on: ubuntu-latest
@@ -124,11 +124,11 @@ jobs:
124124
uses: actions/checkout@v4
125125
- name: Build web image (amd64) and load locally
126126
run: |
127-
docker buildx build --platform linux/amd64 -t nexent/nexent-web-commercial:beta-amd64 --load -f make/web/Dockerfile .
127+
docker buildx build --platform linux/amd64 -t nexent/nexent-web:beta-amd64 --load -f make/web/Dockerfile .
128128
- name: Login to DockerHub
129129
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
130130
- name: Push web image (amd64) to DockerHub
131-
run: docker push nexent/nexent-web-commercial:beta-amd64
131+
run: docker push nexent/nexent-web:beta-amd64
132132

133133
build-and-push-web-arm64:
134134
runs-on: ubuntu-latest
@@ -144,11 +144,11 @@ jobs:
144144
uses: actions/checkout@v4
145145
- name: Build web image (arm64) and load locally
146146
run: |
147-
docker buildx build --platform linux/arm64 -t nexent/nexent-web-commercial:beta-arm64 --load -f make/web/Dockerfile .
147+
docker buildx build --platform linux/arm64 -t nexent/nexent-web:beta-arm64 --load -f make/web/Dockerfile .
148148
- name: Login to DockerHub
149149
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
150150
- name: Push web image (arm64) to DockerHub
151-
run: docker push nexent/nexent-web-commercial:beta-arm64
151+
run: docker push nexent/nexent-web:beta-arm64
152152

153153
manifest-push-main:
154154
runs-on: ubuntu-latest
@@ -160,10 +160,10 @@ jobs:
160160
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
161161
- name: Create and push manifest for main (DockerHub)
162162
run: |
163-
docker manifest create nexent/nexent-commercial:beta \
164-
nexent/nexent-commercial:beta-amd64 \
165-
nexent/nexent-commercial:beta-arm64
166-
docker manifest push nexent/nexent-commercial:beta
163+
docker manifest create nexent/nexent:beta \
164+
nexent/nexent:beta-amd64 \
165+
nexent/nexent:beta-arm64
166+
docker manifest push nexent/nexent:beta
167167
168168
manifest-push-data-process:
169169
runs-on: ubuntu-latest
@@ -175,10 +175,10 @@ jobs:
175175
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
176176
- name: Create and push manifest for data-process (DockerHub)
177177
run: |
178-
docker manifest create nexent/nexent-data-process-commercial:beta \
179-
nexent/nexent-data-process-commercial:beta-amd64 \
180-
nexent/nexent-data-process-commercial:beta-arm64
181-
docker manifest push nexent/nexent-data-process-commercial:beta
178+
docker manifest create nexent/nexent-data-process:beta \
179+
nexent/nexent-data-process:beta-amd64 \
180+
nexent/nexent-data-process:beta-arm64
181+
docker manifest push nexent/nexent-data-process:beta
182182
183183
manifest-push-web:
184184
runs-on: ubuntu-latest
@@ -190,7 +190,7 @@ jobs:
190190
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u nexent --password-stdin
191191
- name: Create and push manifest for web (DockerHub)
192192
run: |
193-
docker manifest create nexent/nexent-web-commercial:beta \
194-
nexent/nexent-web-commercial:beta-amd64 \
195-
nexent/nexent-web-commercial:beta-arm64
196-
docker manifest push nexent/nexent-web-commercial:beta
193+
docker manifest create nexent/nexent-web:beta \
194+
nexent/nexent-web:beta-amd64 \
195+
nexent/nexent-web:beta-arm64
196+
docker manifest push nexent/nexent-web:beta

‎.github/workflows/docker-build-push-mainland.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
uses: actions/checkout@v4
2424
- name: Build main image (amd64) and load locally
2525
run: |
26-
docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:amd64 -f make/main/Dockerfile .
26+
docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:amd64 -f make/main/Dockerfile .
2727
- name: Login to Tencent Cloud
2828
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
2929
- name: Push main image (amd64) to Tencent Cloud
30-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:amd64
30+
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent:amd64
3131

3232
build-and-push-main-arm64:
3333
runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -43,11 +43,11 @@ jobs:
4343
uses: actions/checkout@v4
4444
- name: Build main image (arm64) and load locally
4545
run: |
46-
docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:arm64 -f make/main/Dockerfile .
46+
docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:arm64 -f make/main/Dockerfile .
4747
- name: Login to Tencent Cloud
4848
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
4949
- name: Push main image (arm64) to Tencent Cloud
50-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:arm64
50+
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent:arm64
5151

5252
build-and-push-data-process-amd64:
5353
runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -72,11 +72,11 @@ jobs:
7272
rm -rf .git .gitattributes
7373
- name: Build data process image (amd64) and load locally
7474
run: |
75-
docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:amd64 -f make/data_process/Dockerfile .
75+
docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:amd64 -f make/data_process/Dockerfile .
7676
- name: Login to Tencent Cloud
7777
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
7878
- name: Push data process image (amd64) to Tencent Cloud
79-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:amd64
79+
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:amd64
8080

8181
build-and-push-data-process-arm64:
8282
runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -101,11 +101,11 @@ jobs:
101101
rm -rf .git .gitattributes
102102
- name: Build data process image (arm64) and load locally
103103
run: |
104-
docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:arm64 -f make/data_process/Dockerfile .
104+
docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:arm64 -f make/data_process/Dockerfile .
105105
- name: Login to Tencent Cloud
106106
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
107107
- name: Push data process image (arm64) to Tencent Cloud
108-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:arm64
108+
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:arm64
109109

110110
build-and-push-web-amd64:
111111
runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -121,11 +121,11 @@ jobs:
121121
uses: actions/checkout@v4
122122
- name: Build web image (amd64) and load locally
123123
run: |
124-
docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:amd64 -f make/web/Dockerfile .
124+
docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:amd64 -f make/web/Dockerfile .
125125
- name: Login to Tencent Cloud
126126
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
127127
- name: Push web image (amd64) to Tencent Cloud
128-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:amd64
128+
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-web:amd64
129129

130130
build-and-push-web-arm64:
131131
runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -141,11 +141,11 @@ jobs:
141141
uses: actions/checkout@v4
142142
- name: Build web image (arm64) and load locally
143143
run: |
144-
docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:arm64 -f make/web/Dockerfile .
144+
docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:arm64 -f make/web/Dockerfile .
145145
- name: Login to Tencent Cloud
146146
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
147147
- name: Push web image (arm64) to Tencent Cloud
148-
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:arm64
148+
run: docker push ccr.ccs.tencentyun.com/nexent-hub/nexent-web:arm64
149149

150150
manifest-push-main:
151151
runs-on: ubuntu-latest
@@ -157,10 +157,10 @@ jobs:
157157
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
158158
- name: Create and push manifest for main (Tencent Cloud)
159159
run: |
160-
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:latest \
161-
ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:amd64 \
162-
ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:arm64
163-
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-commercial:latest
160+
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent:latest \
161+
ccr.ccs.tencentyun.com/nexent-hub/nexent:amd64 \
162+
ccr.ccs.tencentyun.com/nexent-hub/nexent:arm64
163+
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent:latest
164164
165165
manifest-push-data-process:
166166
runs-on: ubuntu-latest
@@ -172,10 +172,10 @@ jobs:
172172
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
173173
- name: Create and push manifest for data-process (Tencent Cloud)
174174
run: |
175-
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:latest \
176-
ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:amd64 \
177-
ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:arm64
178-
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process-commercial:latest
175+
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:latest \
176+
ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:amd64 \
177+
ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:arm64
178+
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:latest
179179
180180
manifest-push-web:
181181
runs-on: ubuntu-latest
@@ -187,7 +187,7 @@ jobs:
187187
run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
188188
- name: Create and push manifest for web (Tencent Cloud)
189189
run: |
190-
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:latest \
191-
ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:amd64 \
192-
ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:arm64
193-
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-web-commercial:latest
190+
docker manifest create ccr.ccs.tencentyun.com/nexent-hub/nexent-web:latest \
191+
ccr.ccs.tencentyun.com/nexent-hub/nexent-web:amd64 \
192+
ccr.ccs.tencentyun.com/nexent-hub/nexent-web:arm64
193+
docker manifest push ccr.ccs.tencentyun.com/nexent-hub/nexent-web:latest

0 commit comments

Comments
 (0)