@@ -29,23 +29,13 @@ jobs:
2929 repo : ['development', 'testing', 'release']
3030 image : ['hosted-ce', 'osg-ce-condor']
3131 osg_series :
32- - name : ' 23'
33- os : ' el9'
34- project : ' opensciencegrid'
3532 - name : ' 24'
3633 os : ' el9'
3734 project : ' osg-htc'
3835 steps :
3936
4037 - uses : actions/checkout@v3
4138
42- - name : Log in to Docker Hub
43- uses : docker/login-action@v2.2.0
44- if : github.event_name != 'pull_request' && startsWith(github.repository, 'opensciencegrid/')
45- with :
46- username : ${{ secrets.DOCKER_USERNAME }}
47- password : ${{ secrets.DOCKER_PASSWORD }}
48-
4939 - name : Log in to OSG Harbor
5040 uses : docker/login-action@v2.2.0
5141 if : github.event_name != 'pull_request' && startsWith(github.repository, 'opensciencegrid/')
7666 run : |
7767 docker_repo=$PROJECT/$IMAGE
7868 tag_list=()
79- for registry in hub.opensciencegrid.org docker.io; do
80- if [[ $registry == 'docker.io' && $PROJECT == 'osg-htc' ]]; then
81- continue
82- fi
83- for image_tag in "$OSG_SERIES-$REPO" "$OSG_SERIES-$REPO-$TIMESTAMP"; do
84- tag_list+=("$registry/$docker_repo":"$image_tag")
85- done
69+ registry=hub.opensciencegrid.org
70+ for image_tag in "$OSG_SERIES-$REPO" "$OSG_SERIES-$REPO-$TIMESTAMP"; do
71+ tag_list+=("$registry/$docker_repo":"$image_tag")
8672 done
8773 # This causes the tag_list array to be comma-separated below,
8874 # which is required for build-push-action
9480 with :
9581 driver : docker # If not set to docker driver, it will default to docker-container
9682 # when using load for the build-push-action.
97-
83+
9884 - name : Build and push hosted-ce and osg-ce-condor images
9985 uses : docker/build-push-action@v4
10086 with :
0 commit comments