Skip to content

Commit

Permalink
refactor publish job to separate actions workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
pmhalvor committed Oct 20, 2024
1 parent e708c30 commit 0d0b286
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 32 deletions.
35 changes: 3 additions & 32 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build Push & Deploy
name: Build & Push Images to Google Artifact Registry

on:
push:
branches:
- main # Runs on push to the main branch
pull_request: # TODO remove, so only merges to main trigger this
pull_request:
branches:
- main # Runs on pull requests to the main branch

Expand All @@ -14,12 +14,10 @@ env:
SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }}
MODEL_REGISTERY: ${{ secrets.MODEL_REGISTERY }}
DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

jobs:
build-push-images:
name: Build and Push Images to Google Artifact Registry
name: Build and Push Images
permissions:
contents: 'read'
id-token: 'write'
Expand Down Expand Up @@ -55,30 +53,3 @@ jobs:
run: make build-push-pipeline-worker
env:
MODEL_REGISTERY: ${{ env.MODEL_REGISTERY }}

# below job is a bit overkill, but ensure teh images are publically available
publish-model-server:
name: Publish Latest Images to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Docker Auth (Docker Hub)
id: docker-auth-dockerhub
uses: docker/login-action@v3
with:
username: ${{env.DOCKERHUB_USERNAME}}
password: ${{env.DOCKERHUB_TOKEN}}

- name: Publish Latest Model Server Image
run: make publish-latest-model-server
env:
MODEL_REGISTERY: ${{ env.MODEL_REGISTERY }}
PUBLIC_MODEL_REGISTERY: docker.io/${{ env.DOCKERHUB_USERNAME }}

- name: Publish Latest Pipeline Worker Image
run: make publish-latest-pipeline-worker
env:
MODEL_REGISTERY: ${{ env.MODEL_REGISTERY }}
PUBLIC_MODEL_REGISTERY: docker.io/${{ env.DOCKERHUB_USERNAME }}
39 changes: 39 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Publish Latest Images to Docker Hub

on:
push:
branches:
- main # Runs on push to the main branch


env:
MODEL_REGISTERY: ${{ secrets.MODEL_REGISTERY }}
DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

jobs:
publish-model-server:
name: Publish Latest Images
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Docker Auth (Docker Hub)
id: docker-auth-dockerhub
uses: docker/login-action@v3
with:
username: ${{env.DOCKERHUB_USERNAME}}
password: ${{env.DOCKERHUB_TOKEN}}

- name: Publish Latest Model Server Image
run: make publish-latest-model-server
env:
MODEL_REGISTERY: ${{ env.MODEL_REGISTERY }}
PUBLIC_MODEL_REGISTERY: docker.io/${{ env.DOCKERHUB_USERNAME }}

- name: Publish Latest Pipeline Worker Image
run: make publish-latest-pipeline-worker
env:
MODEL_REGISTERY: ${{ env.MODEL_REGISTERY }}
PUBLIC_MODEL_REGISTERY: docker.io/${{ env.DOCKERHUB_USERNAME }}

0 comments on commit 0d0b286

Please sign in to comment.