diff options
| author | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2024-05-01 21:51:07 +1000 |
|---|---|---|
| committer | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2024-05-02 22:59:30 +1000 |
| commit | 5e6c305e672764c4c530a2222f864980d59c8361 (patch) | |
| tree | a86e257b7a47e7d0b715108142b04961e626901a /utils | |
| parent | 773ca3451a94f5adcc6f8c6d4543037cf308dbe3 (diff) | |
docker: Update to 26.1.0
* Removed unnecessary GO lang variables
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/docker/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/utils/docker/Makefile b/utils/docker/Makefile index cd1a39863..868954b5a 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=25.0.3 +PKG_VERSION:=26.1.0 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=04ad0cea992a65db20cb1b0dbf6d1ce32c705ce879de51b22095fe8d28030815 -PKG_GIT_SHORT_COMMIT:=4debf41 # SHA1 used within the docker executables +PKG_HASH:=742d8297c8222d4c6e1a5840d1604e215c94cbbee1c275a12fb98abd572083de +PKG_GIT_SHORT_COMMIT:=9714adc # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> @@ -36,11 +36,13 @@ define Package/docker/description The CLI used in the Docker CE and Docker EE products. endef -GO_PKG_BUILD_VARS += GO111MODULE=auto +GO_PKG_INSTALL_EXTRA:=\ + cli/compose/schema/data \ + vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb + TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lc -lgcc_eh) -GO_PKG_INSTALL_EXTRA:=cli/compose/schema/data define Build/Prepare $(Build/Prepare/Default) |