Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions .github/workflows/release-series-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,13 @@ jobs:
repo: ['development', 'testing', 'release']
image: ['hosted-ce', 'osg-ce-condor']
osg_series:
- name: '23'
os: 'el9'
project: 'opensciencegrid'
- name: '24'
os: 'el9'
project: 'osg-htc'
steps:

- uses: actions/checkout@v3

- name: Log in to Docker Hub
uses: docker/login-action@v2.2.0
if: github.event_name != 'pull_request' && startsWith(github.repository, 'opensciencegrid/')
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Log in to OSG Harbor
uses: docker/login-action@v2.2.0
if: github.event_name != 'pull_request' && startsWith(github.repository, 'opensciencegrid/')
Expand Down Expand Up @@ -76,13 +66,9 @@ jobs:
run: |
docker_repo=$PROJECT/$IMAGE
tag_list=()
for registry in hub.opensciencegrid.org docker.io; do
if [[ $registry == 'docker.io' && $PROJECT == 'osg-htc' ]]; then
continue
fi
for image_tag in "$OSG_SERIES-$REPO" "$OSG_SERIES-$REPO-$TIMESTAMP"; do
tag_list+=("$registry/$docker_repo":"$image_tag")
done
registry=hub.opensciencegrid.org
for image_tag in "$OSG_SERIES-$REPO" "$OSG_SERIES-$REPO-$TIMESTAMP"; do
tag_list+=("$registry/$docker_repo":"$image_tag")
done
# This causes the tag_list array to be comma-separated below,
# which is required for build-push-action
Expand All @@ -94,7 +80,7 @@ jobs:
with:
driver: docker # If not set to docker driver, it will default to docker-container
# when using load for the build-push-action.

- name: Build and push hosted-ce and osg-ce-condor images
uses: docker/build-push-action@v4
with:
Expand Down