From d809cc10200ea1069cd9b4a8da83c027e84465be Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 27 Sep 2020 23:40:54 +0200
Subject: [PATCH] Fix variant image name generation

---
 .github/workflows/build.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a961ca..181da62 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,14 +73,17 @@ jobs:
           registry: docker.pkg.github.com
           username: ${{ github.actor }}
           password: ${{ github.token }}
-      - name: Pull latest
-        run: docker pull docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest || true
-      - name: Build variant image
+      - name: Image Name
+        id: imagename
         run: |
           IMG="docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
-          docker build --pull --cache-from "$IMG" --tag "$IMG" .
+          echo "::set-output name=name::${IMG/ /-}"
+      - name: Pull latest
+        run: docker pull ${{ steps.imagename.outputs.name }} || true
+      - name: Build variant image
+        run: docker build --pull --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} .
       - name: Push variant image
-        run: docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest
+        run: docker push ${{ steps.imagename.outputs.name }}
   build_ffmpeg:
     name: Build ffmpeg
     needs: build_targets