Skip to content

Commit 9517c4d

Browse files
committed
Remove the ability to specify a tag list
Its behavior was confusing
1 parent d7c7b8d commit 9517c4d

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

action.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ inputs:
99
repo:
1010
description: 'Input string that gets passed along to the docker build args'
1111
required: true
12-
tag_list:
13-
description: 'List of comma-separated tags that gets passed along to the docker build args'
14-
required: false
15-
default: '' # set to an empty string
1612
registry_url:
1713
description: 'URL of the registry'
1814
required: true
@@ -54,20 +50,15 @@ runs:
5450
env:
5551
REPO: ${{ inputs.repo }}
5652
OSG_SERIES: ${{ inputs.osg_series }}
57-
run: |
58-
if [ -z "${{ inputs.tag_list }}" ]; then
59-
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
60-
tag_list=()
61-
for image_tag in "$REPO" "$REPO-$(date +%Y%m%d-%H%M)"; do
62-
tag_list=$docker_repo:$OSG_SERIES-$REPO,$docker_repo:$OSG_SERIES-$REPO-$(date +%Y%m%d-%H%M)
63-
done
64-
IFS=,
65-
echo "::set-output name=taglist::${tag_list[*]}"
66-
else
67-
tag_list=$(echo ${{ inputs.tag_list }} | sed -E "s/([^,]+)/${{ inputs.registry_url }}\/\1/g")
68-
echo "::set-output name=taglist::$tag_list"
69-
fi
7053
shell: bash
54+
run: |
55+
docker_repo=opensciencegrid/${{ steps.generate-image-name.outputs.image }}
56+
tag_list=()
57+
for image_tag in "$REPO" "$REPO-$(date +%Y%m%d-%H%M)"; do
58+
tag_list+=$docker_repo:$image_tag
59+
done
60+
IFS=,
61+
echo "::set-output name=taglist::${tag_list[*]}"
7162
7263
- name: Import Docker images from cache
7364
uses: actions/cache@v2

0 commit comments

Comments
 (0)