From 7ecf320e1be8467f98388e5acd31882919cd3847 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 24 Sep 2020 13:01:42 +0200
Subject: [PATCH] Fix make -f docker.Makefile without buildkit enabled

Commit 01cd748eb6eec123d50637b7b1c835755392717e started using
Dockerfile features that are currently only supported with
buildkit enabled.

While we enabled buildkit in our Jenkinsfile, the makefile
did not do the same, causing some targets to fail if buildkit
was not enabled.

This patch updates the makefile to enable buildkit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Jenkinsfile     | 8 ++++----
 docker.Makefile | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ae2d0cbfaa..d5028c921b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
             steps {
                 sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                     IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                    DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-non-experimental"
+                    make -f docker.Makefile test-e2e-non-experimental"
             }
         }
         stage("e2e (non-experimental) - 18.09 engine") {
@@ -26,21 +26,21 @@ pipeline {
                 sh "E2E_ENGINE_VERSION=18.09-dind \
                   E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                   IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                  DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-non-experimental"
+                  make -f docker.Makefile test-e2e-non-experimental"
             }
         }
         stage("e2e (experimental)") {
             steps {
                 sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                     IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                    DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-experimental"
+                    make -f docker.Makefile test-e2e-experimental"
             }
         }
         stage("e2e (ssh connhelper)") {
             steps {
                 sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                     IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                    DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-connhelper-ssh"
+                    make -f docker.Makefile test-e2e-connhelper-ssh"
             }
         }
     }
diff --git a/docker.Makefile b/docker.Makefile
index d30d56b4ce..804133b2fb 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -23,6 +23,9 @@ endif
 VERSION = $(shell cat VERSION)
 ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS -e TESTDIRS -e GOOS -e GOARCH -e GOARM -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION)
 
+# Some Dockerfiles use features that are only supported with BuildKit enabled
+export DOCKER_BUILDKIT=1
+
 # build docker image (dockerfiles/Dockerfile.build)
 .PHONY: build_docker_image
 build_docker_image: