|
|
|
@ -83,16 +83,17 @@ jobs:
@@ -83,16 +83,17 @@ jobs:
|
|
|
|
|
echo "GIT_TAG=${tag:1}" >> $GITHUB_ENV |
|
|
|
|
echo "DOCKER_TAG=${tag/-prealpha/}" >> $GITHUB_ENV |
|
|
|
|
|
|
|
|
|
- name: Set up Docker Buildx |
|
|
|
|
- name: Set up Docker Buildx Base |
|
|
|
|
uses: docker/setup-buildx-action@v1 |
|
|
|
|
id: builder-base |
|
|
|
|
|
|
|
|
|
- name: Cache Docker layers |
|
|
|
|
uses: actions/cache@v2.1.4 |
|
|
|
|
with: |
|
|
|
|
path: /tmp/.buildx-cache |
|
|
|
|
key: ${{ runner.os }}-buildx-${{ github.sha }} |
|
|
|
|
restore-keys: | |
|
|
|
|
${{ runner.os }}-buildx- |
|
|
|
|
- name: Set up Docker Buildx NVIDIA |
|
|
|
|
uses: docker/setup-buildx-action@v1 |
|
|
|
|
id: builder-nvidia |
|
|
|
|
|
|
|
|
|
- name: Set up Docker Buildx VAAPI |
|
|
|
|
uses: docker/setup-buildx-action@v1 |
|
|
|
|
id: builder-vaapi |
|
|
|
|
|
|
|
|
|
- name: Login to DockerHub |
|
|
|
|
uses: docker/login-action@v1 |
|
|
|
@ -103,6 +104,7 @@ jobs:
@@ -103,6 +104,7 @@ jobs:
|
|
|
|
|
- name: Build and push base |
|
|
|
|
uses: docker/build-push-action@v2 |
|
|
|
|
with: |
|
|
|
|
builder: ${{ steps.builder-base.outputs.name }} |
|
|
|
|
context: . |
|
|
|
|
file: ./docker/Dockerfile |
|
|
|
|
push: true |
|
|
|
@ -111,12 +113,11 @@ jobs:
@@ -111,12 +113,11 @@ jobs:
|
|
|
|
|
tags: | |
|
|
|
|
jasongdove/ersatztv:latest |
|
|
|
|
jasongdove/ersatztv:${{ env.DOCKER_TAG }} |
|
|
|
|
cache-from: type=local,src=/tmp/.buildx-cache |
|
|
|
|
cache-to: type=local,dest=/tmp/.buildx-cache,mode=max |
|
|
|
|
|
|
|
|
|
- name: Build and push nvidia |
|
|
|
|
uses: docker/build-push-action@v2 |
|
|
|
|
with: |
|
|
|
|
builder: ${{ steps.builder-nvidia.outputs.name }} |
|
|
|
|
context: . |
|
|
|
|
file: ./docker/nvidia/Dockerfile |
|
|
|
|
push: true |
|
|
|
@ -125,12 +126,11 @@ jobs:
@@ -125,12 +126,11 @@ jobs:
|
|
|
|
|
tags: | |
|
|
|
|
jasongdove/ersatztv:latest-nvidia |
|
|
|
|
jasongdove/ersatztv:${{ env.DOCKER_TAG }}-nvidia |
|
|
|
|
cache-from: type=local,src=/tmp/.buildx-cache |
|
|
|
|
cache-to: type=local,dest=/tmp/.buildx-cache,mode=max |
|
|
|
|
|
|
|
|
|
- name: Build and push vaapi |
|
|
|
|
uses: docker/build-push-action@v2 |
|
|
|
|
with: |
|
|
|
|
builder: ${{ steps.builder-vaapi.outputs.name }} |
|
|
|
|
context: . |
|
|
|
|
file: ./docker/vaapi/Dockerfile |
|
|
|
|
push: true |
|
|
|
@ -139,5 +139,3 @@ jobs:
@@ -139,5 +139,3 @@ jobs:
|
|
|
|
|
tags: | |
|
|
|
|
jasongdove/ersatztv:latest-vaapi |
|
|
|
|
jasongdove/ersatztv:${{ env.DOCKER_TAG }}-vaapi |
|
|
|
|
cache-from: type=local,src=/tmp/.buildx-cache |
|
|
|
|
cache-to: type=local,dest=/tmp/.buildx-cache,mode=max |
|
|
|
|