From e962762046ec4021546ed6eb14ad641626bb06e3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 21:42:34 +0200
Subject: [PATCH] Docker --cache-from only uses first image

See also https://stackoverflow.com/a/56024061/8924614
---
 .github/workflows/release-dev.yml | 6 +-----
 .github/workflows/release.yml     | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 57ec71845b..9544b24a5c 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -158,7 +158,7 @@ jobs:
         run: script/setup
       - name: Install Github Actions annotator
         run: pip install pytest-github-actions-annotate-failures
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
@@ -204,8 +204,6 @@ jobs:
           echo "::set-env name=DOCKERFILE::${dockerfile}"
       - name: Pull for cache
         run: |
-          docker pull "${BUILD_TO}:latest" || true
-          docker pull "${BUILD_TO}:beta" || true
           docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
@@ -215,8 +213,6 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${BUILD_TO}:${TAG}" \
             --tag "${BUILD_TO}:dev" \
-            --cache-from "${BUILD_TO}:latest" \
-            --cache-from "${BUILD_TO}:beta" \
             --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
             .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8196d39fbc..569a3adf57 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -136,7 +136,7 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/python.json"
       - run: esphome tests/${{ matrix.test }}.yaml compile
-  
+
   pytest:
     runs-on: ubuntu-latest
     steps:
@@ -156,7 +156,7 @@ jobs:
         run: script/setup
       - name: Install Github Actions annotator
         run: pip install pytest-github-actions-annotate-failures
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
@@ -225,8 +225,6 @@ jobs:
       - name: Pull for cache
         run: |
           docker pull "${BUILD_TO}:latest" || true
-          docker pull "${BUILD_TO}:beta" || true
-          docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
       - run: |
@@ -235,8 +233,6 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${BUILD_TO}:${TAG}" \
             --cache-from "${BUILD_TO}:latest" \
-            --cache-from "${BUILD_TO}:beta" \
-            --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
             .
       - name: Log in to docker hub