Don't use deprecated docker action

This commit is contained in:
BtbN 2020-09-20 02:40:08 +02:00
parent 4eb20ade1b
commit 79e97cc7f2
1 changed files with 24 additions and 26 deletions

View File

@ -14,18 +14,17 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:base || true
- name: Build and push base
uses: docker/build-push-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}
always_pull: true
cache_froms: btbn/ffmpeg-builder:base
repository: btbn/ffmpeg-builder
tags: base
path: images/base
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:base || true
- name: Build base image
run: docker build --pull --cache-from btbn/ffmpeg-builder:base --tag btbn/ffmpeg-builder:base images/base
- name: Push base image
run: docker push btbn/ffmpeg-builder:base
build_target_bases:
name: Build target base image
needs: build_base
@ -37,18 +36,17 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:base-${{ matrix.target }} || true
- name: Build and push target base
uses: docker/build-push-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}
always_pull: true
cache_froms: btbn/ffmpeg-builder:base-${{ matrix.target }}
repository: btbn/ffmpeg-builder
tags: base-${{ matrix.target }}
path: images/base-${{ matrix.target }}
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:base-${{ matrix.target }} || true
- name: Build target base image
run: docker build --pull --cache-from btbn/ffmpeg-builder:base-${{ matrix.target }} --tag btbn/ffmpeg-builder:base-${{ matrix.target }} images/base-${{ matrix.target }}
- name: Push target base image
run: docker push btbn/ffmpeg-builder:base-${{ matrix.target }}
build_targets:
name: Build target-variant image
needs: build_target_bases
@ -63,17 +61,17 @@ jobs:
uses: actions/checkout@v2
- name: Generate Dockerfile
run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }}
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} || true
- name: Build and push target base
uses: docker/build-push-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}
always_pull: true
cache_froms: btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }}
repository: btbn/ffmpeg-builder
tags: ${{ matrix.target }}-${{ matrix.variant }}
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} || true
- name: Build variant image
run: docker build --pull --cache-from btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} --tag btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} .
- name: Push variant image
run: docker push btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }}
build_ffmpeg:
name: Build ffmpeg
needs: build_targets