Skip to content

Commit

Permalink
Remove DOCKER_CLI_EXPERIMENTAL usage
Browse files Browse the repository at this point in the history
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 <sean.mcginnis@gmail.com>
  • Loading branch information
stmcginnis committed Jun 28, 2024
1 parent efd8c7c commit 88f6cc7
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions hack/build/init-buildx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
1 change: 0 additions & 1 deletion hack/release/build/push-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions images/Makefile.common.in
Original file line number Diff line number Diff line change
Expand Up @@ -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?=
Expand Down

0 comments on commit 88f6cc7

Please sign in to comment.