@@ -2,17 +2,11 @@ name: docker-image
22
33on :
44 workflow_dispatch :
5- inputs :
6- tag :
7- description : ' Tag to build (e.g. v6.9.36-0)'
8- required : false
9- type : string
105 push :
116 tags :
127 - v*
138
149env :
15- FORCE_JAVASCRIPT_ACTIONS_TO_NODE24 : true
1610 APP_NAME : CLIProxyAPI
1711 DOCKERHUB_REPO : ${{ secrets.DOCKERHUB_USERNAME }}/cli-proxy-api-plus
1812
3529 password : ${{ secrets.DOCKERHUB_TOKEN }}
3630 - name : Generate Build Metadata
3731 run : |
38- VERSION="${{ inputs.tag }}"
39- if [ -z "$VERSION" ]; then
40- VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
41- fi
42- echo "VERSION=${VERSION}" >> $GITHUB_ENV
32+ echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
4333 echo COMMIT=`git rev-parse --short HEAD` >> $GITHUB_ENV
4434 echo BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` >> $GITHUB_ENV
4535 - name : Build and push (amd64)
7464 password : ${{ secrets.DOCKERHUB_TOKEN }}
7565 - name : Generate Build Metadata
7666 run : |
77- VERSION="${{ inputs.tag }}"
78- if [ -z "$VERSION" ]; then
79- VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
80- fi
81- echo "VERSION=${VERSION}" >> $GITHUB_ENV
67+ echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
8268 echo COMMIT=`git rev-parse --short HEAD` >> $GITHUB_ENV
8369 echo BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` >> $GITHUB_ENV
8470 - name : Build and push (arm64)
@@ -112,11 +98,7 @@ jobs:
11298 password : ${{ secrets.DOCKERHUB_TOKEN }}
11399 - name : Generate Build Metadata
114100 run : |
115- VERSION="${{ inputs.tag }}"
116- if [ -z "$VERSION" ]; then
117- VERSION=$(grep -oP '^UPSTREAM_TAG=\K.*' .ccs-fork-upstream.env)
118- fi
119- echo "VERSION=${VERSION}" >> $GITHUB_ENV
101+ echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
120102 echo COMMIT=`git rev-parse --short HEAD` >> $GITHUB_ENV
121103 echo BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` >> $GITHUB_ENV
122104 - name : Create and push multi-arch manifests
0 commit comments