From c44d1b760e8727554f989b3e6fd111aa51b4097b Mon Sep 17 00:00:00 2001
From: Carl Tashian <carl@smallstep.com>
Date: Mon, 17 Aug 2020 12:04:45 -0700
Subject: [PATCH 1/2] Install docker CE as part of travis build

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ec6dce01..b2114bc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ addons:
     - fakeroot
     - bash-completion
     - libpcsclite-dev
+    - docker-ce
 env:
   global:
   - V=1

From 0a02177b510e990f0521d6b3788120456fc9a63b Mon Sep 17 00:00:00 2001
From: Carl Tashian <carl@smallstep.com>
Date: Mon, 17 Aug 2020 12:16:47 -0700
Subject: [PATCH 2/2] Run  directly, for Travis

---
 make/docker.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/docker.mk b/make/docker.mk
index 82c3d961..de1cbdef 100644
--- a/make/docker.mk
+++ b/make/docker.mk
@@ -31,7 +31,9 @@ endif
 		(wget -O $$HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.$(DOCKER_CLIENT_OS)-amd64 && \
 		chmod +x $$HOME/.docker/cli-plugins/docker-buildx)
 
-	docker buildx create --use --name mybuilder --platform="$(DOCKER_PLATFORMS)" || true
+	# Called directly instead of via `docker buildx` because
+	# Travis runs a pre-19.03 Docker that doesn't support plugin discovery
+	$$HOME/.docker/cli-plugins/docker-buildx create --use --name mybuilder --platform="$(DOCKER_PLATFORMS)" || true
 
 .PHONY: docker-prepare
 
@@ -56,7 +58,7 @@ docker-login:
 define DOCKER_BUILDX
 	# $(1) -- Image Tag
 	# $(2) -- Push (empty is no push | --push will push to dockerhub)
-	docker buildx build . --progress plain -t $(DOCKER_IMAGE_NAME):$(1) -f docker/Dockerfile.step-ca --platform="$(DOCKER_PLATFORMS)" $(2)
+	$$HOME/.docker/cli-plugins/docker-buildx build . --progress plain -t $(DOCKER_IMAGE_NAME):$(1) -f docker/Dockerfile.step-ca --platform="$(DOCKER_PLATFORMS)" $(2)
 endef
 
 # For non-master builds don't build the docker containers.