diff --git a/.github/workflows/push-to-docker-hub.yml b/.github/workflows/push-to-docker-hub.yml index 9295a12..31ef47b 100644 --- a/.github/workflows/push-to-docker-hub.yml +++ b/.github/workflows/push-to-docker-hub.yml @@ -1,36 +1,18 @@ -name: Run CI then push to Docker Hub +name: Build, scan and push to Docker Hub on: push: tags: - '*' branches: - - master + - '*' 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 - 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: - # Forcing the right name rather than using ${{ github.repository }} - images: ukwa/archival-acid-test - - 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: Build and push to Docker Hub - uses: docker/build-push-action@v2 - with: - context: archival-acid-test - 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 + with: + image_name: ukwa/archival-acid-test + secrets: + DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} + DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} +