File tree 1 file changed +5
-5
lines changed
1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -19,18 +19,18 @@ jobs:
19
19
shell : bash
20
20
id : docker-tag
21
21
run : |
22
+ unset BRANCH_NAME
22
23
BRANCH_NAME=`echo $GITHUB_REF | cut -d '/' -f3 -`
23
24
echo "BRANCH_NAME: $BRANCH_NAME"
24
25
unset IMG_TAGS ; if [[ $BRANCH_NAME == "master" ]]; then IMG_TAGS='latest' ; else IMG_TAGS="$BRANCH_NAME"; fi
25
26
SHA_TAG=`echo $GITHUB_SHA | head -c 6`
26
27
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}
30
30
- name : Build and push
31
31
uses : docker/build-push-action@v2
32
32
with :
33
33
context : .
34
- platforms : linux/amd64,linux/arm64,linux/arm/v7
34
+ platforms : linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
35
35
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