From d5599cb1b41289adcff86ecf91ee6c069fefa9c1 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 6 Feb 2023 20:30:10 -0800 Subject: [PATCH] package/docker-cli: bump version to v23.0.0 Like docker-engine, docker-cli uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine (see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Signed-off-by: Christian Stewart [yann.morin.1998@free.fr: - use post-extract hook - simplify commit message to refer to docker-engine ] Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..d61f47e46e 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,15 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_FIX_VENDORING + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package))