From c96a3e43e4d900b0d54bd44598ae31c71fe7aa29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Sun, 16 Jul 2023 17:03:23 +0200 Subject: [PATCH 1/3] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24a9d345..ea7e037b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: - name: Build and push Docker image - if: steps.build-encode.outputs.job_skipped != 'true' || github.event_name == 'workflow_dispatch' + if: (steps.build-encode.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' uses: docker/build-push-action@v2 with: context: ./Encode @@ -98,7 +98,7 @@ jobs: run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)" - name: Build and push Docker image - if: steps.build-reader.outputs.job_skipped != 'true' || github.event_name == 'workflow_dispatch' + if: (steps.build-reader.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' uses: docker/build-push-action@v2 with: context: ./Reader @@ -137,7 +137,7 @@ jobs: run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)" - name: Build and push Docker image - if: steps.build-pymetadata.outputs.job_skipped != 'true' || github.event_name == 'workflow_dispatch' + if: (steps.build-pymetadata.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' uses: docker/build-push-action@v2 with: context: ./pyMetadata From c222d490a6ac7a9f89ab4d30c2d2dba28a2870de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Sun, 16 Jul 2023 17:12:45 +0200 Subject: [PATCH 2/3] Update main.yml --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea7e037b..ff04d121 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,6 +54,11 @@ jobs: id: docker-tag run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)" + - name: Docker login + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_HUB_NAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} - name: Build and push Docker image if: (steps.build-encode.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' @@ -97,6 +102,12 @@ jobs: id: docker-tag run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)" + - name: Docker login + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_HUB_NAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} + - name: Build and push Docker image if: (steps.build-reader.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' uses: docker/build-push-action@v2 @@ -136,6 +147,12 @@ jobs: id: docker-tag run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)" + - name: Docker login + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_HUB_NAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} + - name: Build and push Docker image if: (steps.build-pymetadata.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' uses: docker/build-push-action@v2 From f389104bd6be844b21a438dfa680aaa82dc4cbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Sun, 16 Jul 2023 17:17:53 +0200 Subject: [PATCH 3/3] Update main.yml --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff04d121..cb9c4eec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,9 +115,9 @@ jobs: context: ./Reader push: true tags: | - bskjon/media-processing--reader:latest - bskjon/media-processing--reader:${{ github.sha }} - bskjon/media-processing--reader:${{ steps.docker-tag.outputs.tag }} + bskjon/mediaprocessing-reader:latest + bskjon/mediaprocessing-reader:${{ github.sha }} + bskjon/mediaprocessing-reader:${{ steps.docker-tag.outputs.tag }} build-pymetadata: if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} @@ -160,6 +160,6 @@ jobs: context: ./pyMetadata push: true tags: | - bskjon/media-processing--pymetadata:latest - bskjon/media-processing--pymetadata:${{ github.sha }} - bskjon/media-processing--pymetadata:${{ steps.docker-tag.outputs.tag }} + bskjon/mediaprocessing-pymetadata:latest + bskjon/mediaprocessing-pymetadata:${{ github.sha }} + bskjon/mediaprocessing-pymetadata:${{ steps.docker-tag.outputs.tag }}