From af99f154e19cd83590ea19c61e3a2d3969857c71 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Wed, 16 May 2018 00:09:20 +0000 Subject: [PATCH] builder: pass DOCKER_BUILDKIT to enable buildkit in tests Signed-off-by: Tibor Vass Upstream-commit: f6e58ca3c8ed880eb6459fbf38e0014f18c9322c Component: engine --- components/engine/Makefile | 1 + components/engine/hack/make/.integration-test-helpers | 1 + 2 files changed, 2 insertions(+) diff --git a/components/engine/Makefile b/components/engine/Makefile index ebca5b1b02..f344b5cc3b 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -31,6 +31,7 @@ DOCKER_ENVS := \ -e DOCKER_BUILD_ARGS \ -e DOCKER_BUILD_GOGC \ -e DOCKER_BUILD_PKGS \ + -e DOCKER_BUILDKIT \ -e DOCKER_BASH_COMPLETION_PATH \ -e DOCKER_CLI_PATH \ -e DOCKER_DEBUG \ diff --git a/components/engine/hack/make/.integration-test-helpers b/components/engine/hack/make/.integration-test-helpers index bb34d45887..da2bb7cad2 100644 --- a/components/engine/hack/make/.integration-test-helpers +++ b/components/engine/hack/make/.integration-test-helpers @@ -84,6 +84,7 @@ test_env() { env -i \ DEST="$ABS_DEST" \ DOCKER_API_VERSION="$DOCKER_API_VERSION" \ + DOCKER_BUILDKIT="$DOCKER_BUILDKIT" \ DOCKER_INTEGRATION_DAEMON_DEST="$DOCKER_INTEGRATION_DAEMON_DEST" \ DOCKER_TLS_VERIFY="$DOCKER_TEST_TLS_VERIFY" \ DOCKER_CERT_PATH="$DOCKER_TEST_CERT_PATH" \