Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
2637b8e476
35
.github/workflows/main.yml
vendored
35
.github/workflows/main.yml
vendored
@ -54,9 +54,14 @@ jobs:
|
|||||||
id: docker-tag
|
id: docker-tag
|
||||||
run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
|
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
|
- 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
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
context: ./Encode
|
context: ./Encode
|
||||||
@ -97,16 +102,22 @@ jobs:
|
|||||||
id: docker-tag
|
id: docker-tag
|
||||||
run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
|
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
|
- 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
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
context: ./Reader
|
context: ./Reader
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
bskjon/media-processing--reader:latest
|
bskjon/mediaprocessing-reader:latest
|
||||||
bskjon/media-processing--reader:${{ github.sha }}
|
bskjon/mediaprocessing-reader:${{ github.sha }}
|
||||||
bskjon/media-processing--reader:${{ steps.docker-tag.outputs.tag }}
|
bskjon/mediaprocessing-reader:${{ steps.docker-tag.outputs.tag }}
|
||||||
|
|
||||||
build-pymetadata:
|
build-pymetadata:
|
||||||
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
|
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
|
||||||
@ -136,13 +147,19 @@ jobs:
|
|||||||
id: docker-tag
|
id: docker-tag
|
||||||
run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
|
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
|
- 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
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
context: ./pyMetadata
|
context: ./pyMetadata
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
bskjon/media-processing--pymetadata:latest
|
bskjon/mediaprocessing-pymetadata:latest
|
||||||
bskjon/media-processing--pymetadata:${{ github.sha }}
|
bskjon/mediaprocessing-pymetadata:${{ github.sha }}
|
||||||
bskjon/media-processing--pymetadata:${{ steps.docker-tag.outputs.tag }}
|
bskjon/mediaprocessing-pymetadata:${{ steps.docker-tag.outputs.tag }}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user