From 79e97cc7f21af75df533935579fc4164d0fe0c88 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 20 Sep 2020 02:40:08 +0200
Subject: [PATCH] Don't use deprecated docker action

---
 .github/workflows/build.yml | 50 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 424d251..0293f37 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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