From 209103c756b4b5fd3637f290face7122b2fbd1e7 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 18 Jul 2024 20:22:05 -0700 Subject: [PATCH] package/docker-cli-buildx: bump version to v0.16.1 Drop the vendor/ workaround as it is no longer necessary. https://github.com/docker/buildx/releases/tag/v0.16.1 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli-buildx/docker-cli-buildx.hash | 2 +- package/docker-cli-buildx/docker-cli-buildx.mk | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/docker-cli-buildx/docker-cli-buildx.hash b/package/docker-cli-buildx/docker-cli-buildx.hash index a6e0b0deab..26b187d12a 100644 --- a/package/docker-cli-buildx/docker-cli-buildx.hash +++ b/package/docker-cli-buildx/docker-cli-buildx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371eb742213ed580179fc4fdfd9a197f0e3115e91979b7907828427d578d49e5 docker-cli-buildx-0.11.2-go2.tar.gz +sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa docker-cli-buildx-0.16.1-go2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-cli-buildx/docker-cli-buildx.mk b/package/docker-cli-buildx/docker-cli-buildx.mk index b62d09fbcc..ea77a86077 100644 --- a/package/docker-cli-buildx/docker-cli-buildx.mk +++ b/package/docker-cli-buildx/docker-cli-buildx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_BUILDX_VERSION = 0.11.2 +DOCKER_CLI_BUILDX_VERSION = 0.16.1 DOCKER_CLI_BUILDX_SITE = $(call github,docker,buildx,v$(DOCKER_CLI_BUILDX_VERSION)) DOCKER_CLI_BUILDX_LICENSE = Apache-2.0 @@ -19,15 +19,6 @@ DOCKER_CLI_BUILDX_LDFLAGS = \ -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Revision=$(DOCKER_CLI_BUILDX_VERSION) \ -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Version=$(DOCKER_CLI_BUILDX_VERSION) -# create the go.mod file with required language version go1.20 -# remove the conflicting vendor/modules.txt -# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 -define DOCKER_CLI_BUILDX_FIX_VENDORING - printf "module $(DOCKER_CLI_BUILDX_GOMOD)\n\ngo 1.20\n" > $(@D)/go.mod - rm -f $(@D)/vendor/modules.txt -endef -DOCKER_CLI_BUILDX_POST_EXTRACT_HOOKS += DOCKER_CLI_BUILDX_FIX_VENDORING - define DOCKER_CLI_BUILDX_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/bin/buildx \ $(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-buildx