Skip to content

SOFTWARE-5993: osg-24 software-base #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2024
Merged

SOFTWARE-5993: osg-24 software-base #96

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1a6496
add osg 24 to build matrix
mwestphall Oct 15, 2024
62c665e
build/push to both osg-htc and opensciencegrid
mwestphall Oct 17, 2024
e315b88
don't try to psuh to docker.io/osg-htc
mwestphall Oct 17, 2024
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
17 changes: 11 additions & 6 deletions .github/workflows/build-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

build:
runs-on: ubuntu-latest
if: startsWith(github.repository, 'opensciencegrid/')
if: startsWith(github.repository, 'opensciencegrid/') || startsWith(github.repository, 'osg-htc/')
strategy:
fail-fast: False
matrix:
Expand All @@ -32,7 +32,7 @@ jobs:
- image: 'nvidia/cuda:11.8.0-runtime-rockylinux8'
tag_str: 'cuda_11_8_0'
repo: ['development', 'testing', 'release']
series: ['23']
series: ['23', '24']
needs: make-date-tag
steps:
- name: checkout docker-software-base
Expand All @@ -45,10 +45,15 @@ jobs:
SERIES: ${{ matrix.series }}
TIMESTAMP: ${{ needs.make-date-tag.outputs.dtag }}
run: |
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
image_name=${GITHUB_REPOSITORY/opensciencegrid\/docker-/}
tags=()
for registry in hub.opensciencegrid.org docker.io; do
tags+=( $registry/$docker_repo:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} )
for docker_repo in opensciencegrid osg-htc; do
# Don't try to push to docker.io/osg-htc
[[ $docker_repo == "osg-htc" && $registry == "docker.io" ]] && continue

tags+=( $registry/$docker_repo/$image_name:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} )
done
done
# This causes the tag_list array to be comma-separated below,
# which is required for build-push-action
Expand All @@ -73,7 +78,7 @@ jobs:

- name: Build and push Docker images
uses: docker/build-push-action@v4
continue-on-error: ${{ matrix.repo == 'development' && matrix.series == '23' }}
continue-on-error: ${{ matrix.repo == 'development' && (matrix.series == '24')}}
with:
context: .
push: true
Expand All @@ -86,7 +91,7 @@ jobs:

dispatch:
runs-on: ubuntu-latest
if: startsWith(github.repository, 'opensciencegrid/')
if: startsWith(github.repository, 'opensciencegrid/') || startsWith(github.repository, 'osg-htc/')
needs: build
strategy:
matrix:
Expand Down
Loading