Skip to content

Commit aaa5955

Browse files
leic4uCopilot
andcommitted
自动触发docker镜像发布
Co-authored-by: Copilot <copilot@github.com>
1 parent 6378687 commit aaa5955

2 files changed

Lines changed: 26 additions & 3 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: docker-image
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
tag:
7+
description: 'Tag to build (e.g. v6.9.36-0)'
8+
required: false
9+
type: string
510
push:
611
tags:
712
- v*
@@ -29,7 +34,10 @@ jobs:
2934
password: ${{ secrets.DOCKERHUB_TOKEN }}
3035
- name: Generate Build Metadata
3136
run: |
32-
VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
37+
VERSION="${{ inputs.tag }}"
38+
if [ -z "$VERSION" ]; then
39+
VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
40+
fi
3341
echo "VERSION=${VERSION}" >> $GITHUB_ENV
3442
echo COMMIT=`git rev-parse --short HEAD` >> $GITHUB_ENV
3543
echo BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` >> $GITHUB_ENV
@@ -65,7 +73,10 @@ jobs:
6573
password: ${{ secrets.DOCKERHUB_TOKEN }}
6674
- name: Generate Build Metadata
6775
run: |
68-
VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
76+
VERSION="${{ inputs.tag }}"
77+
if [ -z "$VERSION" ]; then
78+
VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
79+
fi
6980
echo "VERSION=${VERSION}" >> $GITHUB_ENV
7081
echo COMMIT=`git rev-parse --short HEAD` >> $GITHUB_ENV
7182
echo BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` >> $GITHUB_ENV
@@ -100,7 +111,10 @@ jobs:
100111
password: ${{ secrets.DOCKERHUB_TOKEN }}
101112
- name: Generate Build Metadata
102113
run: |
103-
VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
114+
VERSION="${{ inputs.tag }}"
115+
if [ -z "$VERSION" ]; then
116+
VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
117+
fi
104118
echo "VERSION=${VERSION}" >> $GITHUB_ENV
105119
echo COMMIT=`git rev-parse --short HEAD` >> $GITHUB_ENV
106120
echo BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` >> $GITHUB_ENV

.github/workflows/release.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,12 @@ jobs:
6464
VERSION: ${{ env.VERSION }}
6565
COMMIT: ${{ env.COMMIT }}
6666
BUILD_DATE: ${{ env.BUILD_DATE }}
67+
68+
- name: Trigger docker-image workflow
69+
env:
70+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
run: |
72+
gh workflow run docker-image.yml \
73+
--repo "${{ github.repository }}" \
74+
--ref "${{ github.ref_name }}" \
75+
-f tag="${{ env.VERSION }}"

0 commit comments

Comments
 (0)