File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -19,18 +19,18 @@ jobs:
1919 shell : bash
2020 id : docker-tag
2121 run : |
22+ unset BRANCH_NAME
2223 BRANCH_NAME=`echo $GITHUB_REF | cut -d '/' -f3 -`
2324 echo "BRANCH_NAME: $BRANCH_NAME"
2425 unset IMG_TAGS ; if [[ $BRANCH_NAME == "master" ]]; then IMG_TAGS='latest' ; else IMG_TAGS="$BRANCH_NAME"; fi
2526 SHA_TAG=`echo $GITHUB_SHA | head -c 6`
2627 echo "SHA_TAG: $SHA_TAG"
27- IMG_TAGS="$IMG_TAGS,$SHA_TAG"
28- echo "IMAG_TAGS: $IMG_TAGS"
29- echo ::set-output name=DOCKER_TAGS::${IMG_TAGS}
28+ echo ::set-output name=DOCKER_BRANCH_TAG::${IMG_TAGS}
29+ echo ::set-output name=DOCKER_SHA_TAG::${SHA_TAG}
3030 - name : Build and push
3131 uses : docker/build-push-action@v2
3232 with :
3333 context : .
34- platforms : linux/amd64,linux/arm64,linux/arm/v7
34+ platforms : linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
3535 push : true
36- tags : fengkx/node_rssbot:${{steps.docker-tag.outputs.DOCKER_TAGS }}
36+ tags : fengkx/node_rssbot:${{steps.docker-tag.outputs.DOCKER_BRANCH_TAG}},fengkx/node_rssbot:${{steps.docker-tag.outputs.DOCKER_SHA_TAG }}
You can’t perform that action at this time.
0 commit comments