Skip to content

Commit 011f2fe

Browse files
Merge pull request #4716 from CannonLock/update-web-build-flow
Use generalized image build flow
2 parents 4429785 + 8b66599 commit 011f2fe

File tree

1 file changed

+11
-48
lines changed

1 file changed

+11
-48
lines changed
Lines changed: 11 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,17 @@
1-
name: Build and Push Docker image
1+
name: Build image
22

33
on:
44
push:
5+
branches: ["master"]
56
tags:
6-
- v[0-9]+.[0-9]+.[0-9]+
7-
- v[0-9]+.[0-9]+.[0-9]+.[0-9]+
8-
- v[0-9]+.[0-9]+.[0-9]+.itb.[0-9]+
7+
- 'v*.*.*' # glob for semver tags (including prereleases)
98

109
jobs:
11-
12-
build:
13-
runs-on: ubuntu-latest
14-
if: startsWith(github.repository, 'opensciencegrid/')
15-
steps:
16-
- uses: actions/checkout@v3
17-
18-
- name: Generate tag list
19-
id: generate-tag-list
20-
run: |
21-
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
22-
tag_list=()
23-
for registry in hub.opensciencegrid.org docker.io; do
24-
for image_tag in latest "${GITHUB_REF##*/v}"; do
25-
tag_list+=("$registry/$docker_repo":"$image_tag")
26-
done
27-
done
28-
# This causes the tag_list array to be comma-separated below,
29-
# which is required for build-push-action
30-
IFS=,
31-
echo "taglist=${tag_list[*]}" >> $GITHUB_OUTPUT
32-
33-
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@v2.7.0
35-
36-
- name: Log in to Docker Hub
37-
uses: docker/login-action@v2.2.0
38-
with:
39-
username: ${{ secrets.DOCKER_USERNAME }}
40-
password: ${{ secrets.DOCKER_PASSWORD }}
41-
42-
- name: Log in to OSG Harbor
43-
uses: docker/login-action@v2.2.0
44-
with:
45-
registry: hub.opensciencegrid.org
46-
username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
47-
password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
48-
49-
- name: Build and push Docker images
50-
uses: docker/build-push-action@v4
51-
with:
52-
context: .
53-
push: true
54-
tags: "${{ steps.generate-tag-list.outputs.taglist }}"
10+
call-build-image:
11+
if: ${{ github.repository_owner == 'opensciencegrid' }}
12+
uses: osg-htc/build-push/.github/workflows/build-push.yaml@main
13+
secrets:
14+
password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
15+
username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
16+
with:
17+
image: 'hub.opensciencegrid.org/opensciencegrid/topology'

0 commit comments

Comments
 (0)