[Buildroot] [PATCH v1 1/3] package/docker-engine: bump version to v23.0.0
Christian Stewart
christian at paral.in
Thu Feb 2 13:13:52 UTC 2023
This update requires a workaround for the non-standard vendor/ structure in the
docker-engine repository, which has an invalid vendor/modules.txt file.
Removing the vendor/modules.txt file fixes the build error.
Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705
The go download post-process script uses go mod init to create the go.mod file
which specifies a language version of go1.16 on default. Use go mod edit to
adjust the go.mod file to the required minimum version go1.19 for generic types.
https://github.com/moby/moby/releases/tag/v23.0.0
Signed-off-by: Christian Stewart <christian at paral.in>
---
package/docker-engine/docker-engine.hash | 2 +-
package/docker-engine/docker-engine.mk | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index d15b1359cb..670cbd414b 100644
--- a/package/docker-engine/docker-engine.hash
+++ b/package/docker-engine/docker-engine.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz
+sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz
sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 2a9b72ca78..9c193a29a5 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_ENGINE_VERSION = 20.10.22
+DOCKER_ENGINE_VERSION = 23.0.0
DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
@@ -62,6 +62,19 @@ else
DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs
endif
+# update the go module version to go1.19
+# docker-engine does not use go modules
+# remove the conflicting vendor/modules.txt
+# https://github.com/moby/moby/issues/44618#issuecomment-1343565705
+define DOCKER_ENGINE_CONFIGURE_CMDS
+ if [ -f $(@D)/vendor/modules.txt ]; then \
+ rm $(@D)/vendor/modules.txt; \
+ fi
+ cd $(@D); \
+ $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \
+ $(GO_BIN) mod edit -go=1.19 go.mod
+endef
+
DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS))
define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
--
2.39.1
More information about the buildroot
mailing list