Skip to content

Commit 2056f12

Browse files
committed
ci(docker): 更新 Docker 镜像构建和推送配置
- 添加环境变量配置,提高配置的可维护性和可重用性 - 增加 CNB(中国软件供应链平台)镜像仓库的登录和推送 - 优化镜像名称和标签的生成逻辑,使用环境变量替代硬编码值 - 保持原有的 DockerHub 和阿里云镜像仓库的推送
1 parent 8b1c869 commit 2056f12

File tree

1 file changed

+26
-8
lines changed

1 file changed

+26
-8
lines changed

.github/workflows/build-docker-image.yml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ on:
2020
default: 'warning'
2121
tags:
2222
description: 'Test scenario tags'
23+
env:
24+
DOCKERHUB_USERNAME: eryajf
25+
ALIHUB_URL: registry.cn-hangzhou.aliyuncs.com
26+
ALIHUB_USERNAME: eryajf
27+
CNBHUB_URL: docker.cnb.cool
28+
CNBHUB_USERNAME: cnb
29+
IMAGE_NAME: cloud_dns_exporter
30+
2331

2432
jobs:
2533
buildx:
@@ -48,17 +56,25 @@ jobs:
4856
- name: Login to DockerHub
4957
uses: docker/login-action@v2
5058
with:
51-
username: eryajf
59+
username: ${{ env.DOCKERHUB_USERNAME }}
5260
password: ${{ secrets.DOCKERHUB_TOKEN }}
53-
61+
5462
# 镜像推送到 阿里云仓库
5563
- name: Login to the Ali Registry
5664
uses: docker/login-action@v2
5765
with:
58-
registry: registry.cn-hangzhou.aliyuncs.com
59-
username: eryajf
66+
registry: ${{ env.ALIHUB_URL }}
67+
username: ${{ env.ALIHUB_USERNAME }}
6068
password: ${{ secrets.ALIHUB_TOKEN }}
6169

70+
# 镜像推送到 CNB
71+
- name: Login to the CNB Registry
72+
uses: docker/login-action@v2
73+
with:
74+
registry: ${{ env.CNBHUB_URL }}
75+
username: ${{ env.CNBHUB_USERNAME }}
76+
password: ${{ secrets.CNB_TOKEN }}
77+
6278
- name: Build and push
6379
uses: docker/build-push-action@v4
6480
with:
@@ -70,7 +86,9 @@ jobs:
7086
push: ${{ github.event_name != 'pull_request' }}
7187
# 给清单打上多个标签
7288
tags: |
73-
eryajf/cloud_dns_exporter:latest
74-
eryajf/cloud_dns_exporter:${{ steps.date.outputs.today }}
75-
registry.cn-hangzhou.aliyuncs.com/eryajf/cloud_dns_exporter:${{ env.GITHUB_REF_NAME }}
76-
registry.cn-hangzhou.aliyuncs.com/eryajf/cloud_dns_exporter:latest
89+
${{ env.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
90+
${{ env.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.date.outputs.today }}
91+
${{ env.ALIHUB_URL }}/${{ env.ALIHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.GITHUB_REF_NAME }}
92+
${{ env.ALIHUB_URL }}/${{ env.ALIHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
93+
${{ env.CNBHUB_URL }}/znb/images/${{ env.IMAGE_NAME }}:${{ env.GITHUB_REF_NAME }}
94+
${{ env.CNBHUB_URL }}/znb/images/${{ env.IMAGE_NAME }}:latest

0 commit comments

Comments
 (0)