From 88f6cc70797cd091e752192ee8c44fc153ce2f7a Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Fri, 28 Jun 2024 13:45:39 +0000 Subject: [PATCH] Remove DOCKER_CLI_EXPERIMENTAL usage The DOCKER_CLI_EXPERIMENTAL environment variable was used to enable experimental features in the docker CLI. This capability was deprecated in Docker v19.03 and completely removed in v23.0 [0]. This removes the setting of DOCKER_CLI_EXPERIMENTAL from our scripts as it no longer has any effect and is not needed. [0] https://docs.docker.com/engine/deprecated/#configuration-options-for-experimental-cli-features Signed-off-by: Sean McGinnis --- hack/build/init-buildx.sh | 2 -- hack/release/build/push-node.sh | 1 - images/Makefile.common.in | 3 --- 3 files changed, 6 deletions(-) diff --git a/hack/build/init-buildx.sh b/hack/build/init-buildx.sh index fddb7c7478..bb0d5bd811 100755 --- a/hack/build/init-buildx.sh +++ b/hack/build/init-buildx.sh @@ -15,8 +15,6 @@ set -o errexit -o nounset -o pipefail -export DOCKER_CLI_EXPERIMENTAL=enabled - # We can skip setup if the current builder already has multi-arch # AND if it isn't the docker driver, which doesn't work current_builder="$(docker buildx inspect)" diff --git a/hack/release/build/push-node.sh b/hack/release/build/push-node.sh index e084ff54eb..efb56245ad 100755 --- a/hack/release/build/push-node.sh +++ b/hack/release/build/push-node.sh @@ -71,7 +71,6 @@ for arch in "${__arches__[@]}"; do done # combine to manifest list tagged with kubernetes version -export DOCKER_CLI_EXPERIMENTAL=enabled # images must be pushed to be referenced by docker manifest # we push only after all builds have succeeded for image in "${images[@]}"; do diff --git a/images/Makefile.common.in b/images/Makefile.common.in index 821d9c5379..a5bee36ec4 100644 --- a/images/Makefile.common.in +++ b/images/Makefile.common.in @@ -27,9 +27,6 @@ IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG)$(TAG_SUFFIX) # Go version to use, respected by images that build go binaries GO_VERSION=$(shell cat $(CURDIR)/../../.go-version | head -n1) -# required to enable buildx -export DOCKER_CLI_EXPERIMENTAL=enabled - # build with buildx PLATFORMS?=linux/amd64,linux/arm64 OUTPUT?=