Skip to content

Commit 82b20f6

Browse files
committed
Add OSG release series to tags (SOFTWARE-4944)
1 parent 571e689 commit 82b20f6

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

action.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: 'Push Container Action'
33
description: 'Push built images to Docker Hub/OSG Harbor'
44

55
inputs:
6+
osg_series:
7+
description: 'OSG release series used to install packages'
8+
required: true
69
repo:
710
description: 'Input string that gets passed along to the docker build args'
811
required: true
@@ -29,12 +32,13 @@ runs:
2932
id: generate-tag-list
3033
env:
3134
REPO: ${{ inputs.repo }}
35+
OSG_SERIES: ${{ inputs.osg_series }}
3236
run: |
3337
if [ -z "${{ inputs.tag_list }}" ]; then
3438
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
3539
tag_list=()
3640
for image_tag in "$REPO" "$REPO-$(date +%Y%m%d-%H%M)"; do
37-
tag_list+=("${{ inputs.registry_url }}/$docker_repo":"$image_tag")
41+
tag_list=$docker_repo:$OSG_SERIES-$REPO,$docker_repo:$OSG_SERIES-$REPO-$(date +%Y%m%d-%H%M)
3842
done
3943
IFS=,
4044
echo "::set-output name=taglist::${tag_list[*]}"
@@ -58,7 +62,9 @@ runs:
5862
uses: docker/[email protected]
5963
with:
6064
push: true
61-
build-args: BASE_YUM_REPO=${{ inputs.repo }}
65+
build-args: |
66+
BASE_YUM_REPO=${{ inputs.repo }}
67+
BASE_OSG_SERIES=${{ inputs.osg_series }}
6268
tags: "${{ steps.generate-tag-list.outputs.taglist }}"
6369
cache-from: type=local,src=/tmp/.buildx-cache
64-
70+

0 commit comments

Comments
 (0)