diff --git a/.github/workflows/push-to-docker-hub.yml b/.github/workflows/push-to-docker-hub.yml index be7e49cc..a933903d 100644 --- a/.github/workflows/push-to-docker-hub.yml +++ b/.github/workflows/push-to-docker-hub.yml @@ -1,35 +1,15 @@ -name: Run CI then push to Docker Hub +name: Build, scan and push to Docker Hub on: push: tags: - '*' branches: - - master - - dev + - '*' + jobs: - push_to_docker_hub: - name: Push Docker image to Docker Hub - # This uses the default metadata-action configuration, see https://github.com/docker/metadata-action - # Pushes to master should build `ukwa/ukwa-ui:master`, pushes to dev should build `ukwa/ukwa-ui:dev`, pushes from forks should build e.g. `forker/ukwa-ui:master`. - runs-on: ubuntu-latest - steps: - - name: Check out the repo - uses: actions/checkout@v2 - - name: Set up Docker metadata - id: meta - uses: docker/metadata-action@v3 - with: - images: ${{ github.repository }} - - name: Log in to Docker Hub - if: github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Push to Docker Hub - uses: docker/build-push-action@v2 - with: - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + run_docker_build_workflow: + uses: ukwa/ukwa-services/.github/workflows/push-to-docker-hub.yml@master + secrets: + DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} + DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}