From 1723719761a379f0aa1acf0f0fa1ad811c2d6362 Mon Sep 17 00:00:00 2001 From: hasheddan Date: Mon, 1 Feb 2021 13:14:58 -0600 Subject: [PATCH 1/2] Build release images with DOCKER_CLI_EXPERIMENTAL enabled In order to use buildx with docker versions prior to v20.10 experimental features must be enabled. Setting at build time ensures that they are in case they have not already been at the environment scope. Signed-off-by: hasheddan --- build/lib/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lib/release.sh b/build/lib/release.sh index 2be1ab5072f..4b2855623de 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -383,7 +383,7 @@ EOF echo "COPY nsswitch.conf /etc/" >> "${docker_file_path}" fi - "${DOCKER[@]}" buildx build \ + DOCKER_CLI_EXPERIMENTAL=enabled "${DOCKER[@]}" buildx build \ --platform linux/"${arch}" \ --load ${docker_build_opts:+"${docker_build_opts}"} \ -q \ From 20679f31d124e7219c3978f6152c579cec56215c Mon Sep 17 00:00:00 2001 From: hasheddan Date: Mon, 1 Feb 2021 13:17:28 -0600 Subject: [PATCH 2/2] Build conformance image with DOCKER_CLI_EXPERIMENTAL enabled In order to use buildx with docker versions prior to v20.10 experimental features must be enabled. Setting at build time ensures that they are in case they have not already been at the environment scope. Signed-off-by: hasheddan --- cluster/images/conformance/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile index 35ae5147889..0c5f184975f 100644 --- a/cluster/images/conformance/Makefile +++ b/cluster/images/conformance/Makefile @@ -56,7 +56,7 @@ endif cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile - docker buildx build \ + DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \ --platform linux/${ARCH} \ --load \ --pull \