From ab2a2b1fae0f643752faf57d22142397147fd83b Mon Sep 17 00:00:00 2001
From: Silvin Lubecki <silvin.lubecki@docker.com>
Date: Tue, 3 Mar 2020 11:45:24 +0100
Subject: [PATCH 1/3] Bump buildx to master to check if it builds on the CI

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 0dddbfcc26819411c602f9f55c6fa5c585682072)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 plugins/buildx.installer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/buildx.installer b/plugins/buildx.installer
index f02b99c6d0..e8d5d3e2d2 100644
--- a/plugins/buildx.installer
+++ b/plugins/buildx.installer
@@ -6,7 +6,7 @@ source "$(dirname "$0")/.common"
 PKG=github.com/docker/buildx
 GOPATH=$(go env GOPATH)
 REPO=https://${PKG}.git
-: "${BUILDX_COMMIT=v0.3.1}"
+: "${BUILDX_COMMIT=master}"
 DEST=${GOPATH}/src/${PKG}
 
 build() {

From f43d3d3083af7d65c480ad63ffdac82b78c53e55 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Wed, 29 Apr 2020 20:10:57 -0700
Subject: [PATCH 2/3] buildx: use v0.4.1

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 50aa8f20fdc94c31c69d0a046e1ac72458fc79d9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 plugins/buildx.installer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 plugins/buildx.installer

diff --git a/plugins/buildx.installer b/plugins/buildx.installer
old mode 100644
new mode 100755
index e8d5d3e2d2..aad63ece96
--- a/plugins/buildx.installer
+++ b/plugins/buildx.installer
@@ -6,7 +6,7 @@ source "$(dirname "$0")/.common"
 PKG=github.com/docker/buildx
 GOPATH=$(go env GOPATH)
 REPO=https://${PKG}.git
-: "${BUILDX_COMMIT=master}"
+: "${BUILDX_COMMIT=v0.4.1}"
 DEST=${GOPATH}/src/${PKG}
 
 build() {

From 55f0b0c52db3821ed11c16604a1ba3e3cfa4b63e Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 24 Aug 2020 09:54:15 +0200
Subject: [PATCH 3/3] plugins: update buildx to v0.4.2

full diff: https://github.com/docker/buildx/compare/v0.4.1...v0.4.2

- bake: fix parsing json config with hcl v2
- bake: update go-cty to pull in more stdlib funcs
- bake: ensure --builder is wired from root options
- build: support cacheonly exporter
- build: improve error checking on load
- build: remove warning for multi-platform iidfile

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a6de61c48d7747165732e69b906e82ae86aae4d0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 plugins/buildx.installer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/buildx.installer b/plugins/buildx.installer
index aad63ece96..abf659019e 100755
--- a/plugins/buildx.installer
+++ b/plugins/buildx.installer
@@ -6,7 +6,7 @@ source "$(dirname "$0")/.common"
 PKG=github.com/docker/buildx
 GOPATH=$(go env GOPATH)
 REPO=https://${PKG}.git
-: "${BUILDX_COMMIT=v0.4.1}"
+: "${BUILDX_COMMIT=v0.4.2}"
 DEST=${GOPATH}/src/${PKG}
 
 build() {