[Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16
@ 2023-02-03  3:44 Christian Stewart via buildroot
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 Christian Stewart via buildroot
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Christian Stewart via buildroot @ 2023-02-03  3:44 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

Bugfixes and improvements.

We now install the containerd.service systemd unit.

https://github.com/containerd/containerd/releases/tag/v1.6.16

Signed-off-by: Christian Stewart <christian@paral.in>

---

v1 -> v2:

 - install containerd systemd unit (now required by docker-engine and others)

Signed-off-by: Christian Stewart <christian@paral.in>
---
 package/containerd/containerd.hash | 2 +-
 package/containerd/containerd.mk   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash
index 04a29949d7..16474089d1 100644
--- a/package/containerd/containerd.hash
+++ b/package/containerd/containerd.hash
@@ -1,3 +1,3 @@
 # Computed locally
-sha256  b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320  containerd-1.6.12.tar.gz
+sha256  e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a  containerd-1.6.16.tar.gz
 sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk
index 192175800c..4a0d6ec38b 100644
--- a/package/containerd/containerd.mk
+++ b/package/containerd/containerd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONTAINERD_VERSION = 1.6.12
+CONTAINERD_VERSION = 1.6.16
 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION))
 CONTAINERD_LICENSE = Apache-2.0
 CONTAINERD_LICENSE_FILES = LICENSE
@@ -41,4 +41,10 @@ else
 CONTAINERD_TAGS += no_btrfs
 endif
 
+define CONTAINERD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/containerd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/containerd.service
+	$(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service
+endef
+
 $(eval $(golang-package))
-- 
2.39.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0
  2023-02-03  3:44 [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Christian Stewart via buildroot
@ 2023-02-03  3:44 ` Christian Stewart via buildroot
  2023-02-04 12:56   ` Yann E. MORIN
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 3/4] package/docker-proxy: drop package Christian Stewart via buildroot
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 6+ messages in thread
From: Christian Stewart via buildroot @ 2023-02-03  3:44 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

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
used by docker-engine. (Fixes a build error). Note that this changes the go.mod
language version and is not required to be equal to the current Go tool version.

Note that as of v23.0.0 docker-engine expects containerd to be started by
systemd if --containerd= flag is set in dockerd.service, whereas in previous
versions containerd was started by the docker daemon as a sub-process.

There is no sysv unit for containerd, but this is OK: in the Docker sysv init
file S60dockerd, we do not set the --containerd flag. The docker daemon will
start containerd as a sub-process automatically due to the absence of this flag.

Signed-off-by: Christian Stewart <christian@paral.in>

---

v1 -> v2:

 - clarify commit message about containerd.service and sysv compat
 - fix formatting in S60dockerd
 - bundle commit into a series with required containerd changes

Signed-off-by: Christian Stewart <christian@paral.in>
---
 package/docker-engine/S60dockerd         |  2 +-
 package/docker-engine/docker-engine.hash |  2 +-
 package/docker-engine/docker-engine.mk   | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd
index def8bea149..7591f9fe66 100644
--- a/package/docker-engine/S60dockerd
+++ b/package/docker-engine/S60dockerd
@@ -10,7 +10,7 @@ DAEMON_ARGS=""
 do_start() {
         echo -n "Starting $NAME: "
         start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
+            --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
                 && echo "OK" || echo "FAIL"
 }
 
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..208688cc43 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
@@ -40,6 +40,7 @@ ifeq ($(BR2_INIT_SYSTEMD),y)
 DOCKER_ENGINE_DEPENDENCIES += systemd
 DOCKER_ENGINE_TAGS += systemd journald
 endif
+
 ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
 DOCKER_ENGINE_TAGS += experimental
 endif
@@ -62,6 +63,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

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 Christian Stewart via buildroot
@ 2023-02-04 12:56   ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2023-02-04 12:56 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Thomas Petazzoni, buildroot

Christian, All,

On 2023-02-02 19:44 -0800, Christian Stewart via buildroot spake thusly:
> 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
> used by docker-engine. (Fixes a build error). Note that this changes the go.mod
> language version and is not required to be equal to the current Go tool version.
> 
> Note that as of v23.0.0 docker-engine expects containerd to be started by
> systemd if --containerd= flag is set in dockerd.service, whereas in previous
> versions containerd was started by the docker daemon as a sub-process.
> 
> There is no sysv unit for containerd, but this is OK: in the Docker sysv init
> file S60dockerd, we do not set the --containerd flag. The docker daemon will
> start containerd as a sub-process automatically due to the absence of this flag.
> 
> Signed-off-by: Christian Stewart <christian@paral.in>
> 
> ---
> 
> v1 -> v2:
> 
>  - clarify commit message about containerd.service and sysv compat
>  - fix formatting in S60dockerd
>  - bundle commit into a series with required containerd changes
> 
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
>  package/docker-engine/S60dockerd         |  2 +-
>  package/docker-engine/docker-engine.hash |  2 +-
>  package/docker-engine/docker-engine.mk   | 16 +++++++++++++++-
>  3 files changed, 17 insertions(+), 3 deletions(-)
> 
> diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd
> index def8bea149..7591f9fe66 100644
> --- a/package/docker-engine/S60dockerd
> +++ b/package/docker-engine/S60dockerd
> @@ -10,7 +10,7 @@ DAEMON_ARGS=""
>  do_start() {
>          echo -n "Starting $NAME: "
>          start-stop-daemon --start --quiet --background --make-pidfile \
> -		--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
> +            --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \

TAB-to-space conversion. Although I personally prefer that, that is not
the road we've decided to go down in Buildroot, see for reference:
    package/busybox/S01syslogd

In any case, fixing/converting can adshouldbe done in its own patch.

(You missed the TAB on line 35, by the way.)

>                  && echo "OK" || echo "FAIL"
>  }
>  
> 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..208688cc43 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
> @@ -40,6 +40,7 @@ ifeq ($(BR2_INIT_SYSTEMD),y)
>  DOCKER_ENGINE_DEPENDENCIES += systemd
>  DOCKER_ENGINE_TAGS += systemd journald
>  endif
> +

Spurious empty line, although it does make the code look nicer. Maybe
move that with the sysv-init refactoring/cleanup?

>  ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
>  DOCKER_ENGINE_TAGS += experimental
>  endif
> @@ -62,6 +63,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

No need to test for the presence of a file to remove it; just forcibly
remove it:
    rm -f $(@D)/vendor/modules.txt

Regards,
Yann E. MORIN.

> +	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
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 3/4] package/docker-proxy: drop package
  2023-02-03  3:44 [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Christian Stewart via buildroot
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 Christian Stewart via buildroot
@ 2023-02-03  3:44 ` Christian Stewart via buildroot
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 4/4] package/docker-cli: bump version to v23.0.0 Christian Stewart via buildroot
  2023-02-03  7:39 ` [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Peter Korsgaard
  3 siblings, 0 replies; 6+ messages in thread
From: Christian Stewart via buildroot @ 2023-02-03  3:44 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

The docker-proxy binary (libnetwork) has been merged into the docker-engine
source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build
target of docker-engine instead.

https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3

Signed-off-by: Christian Stewart <christian@paral.in>
---
 Config.in.legacy                       |  8 ++++++++
 DEVELOPERS                             |  1 -
 package/Config.in                      |  1 -
 package/docker-engine/Config.in        |  1 -
 package/docker-engine/docker-engine.mk |  2 +-
 package/docker-proxy/Config.in         | 19 -------------------
 package/docker-proxy/docker-proxy.hash |  3 ---
 package/docker-proxy/docker-proxy.mk   | 21 ---------------------
 8 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 package/docker-proxy/Config.in
 delete mode 100644 package/docker-proxy/docker-proxy.hash
 delete mode 100644 package/docker-proxy/docker-proxy.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 41c5fdefb3..75099f4404 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2023.02"
 
+config BR2_PACKAGE_DOCKER_PROXY
+	bool "docker-proxy removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_DOCKER_ENGINE
+	help
+	  docker-proxy has been dropped by upstream since version
+	  563fe8. it has been merged into docker-engine (moby).
+
 config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
 	bool "imx-gpu-viv X11 output has been removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index e19087c577..7d4f9aa6fe 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -545,7 +545,6 @@ F:	package/delve/
 F:	package/docker-cli/
 F:	package/docker-compose/
 F:	package/docker-engine/
-F:	package/docker-proxy/
 F:	package/embiggen-disk/
 F:	package/fuse-overlayfs/
 F:	package/go/
diff --git a/package/Config.in b/package/Config.in
index 83fddf316f..dc460ca852 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2615,7 +2615,6 @@ menu "System tools"
 	source "package/docker-cli/Config.in"
 	source "package/docker-compose/Config.in"
 	source "package/docker-engine/Config.in"
-	source "package/docker-proxy/Config.in"
 	source "package/earlyoom/Config.in"
 	source "package/efibootmgr/Config.in"
 	source "package/efivar/Config.in"
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 1f0efb8fcc..b5a356eab9 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE
 	depends on BR2_USE_MMU # containerd
 	select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency
 	select BR2_PACKAGE_CONTAINERD # runtime dependency
-	select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
 	select BR2_PACKAGE_IPTABLES # runtime dependency
 	help
 	  Docker is a platform to build, ship,
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 208688cc43..68855dc926 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \
 	-X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)"
 
 DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs
-DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
+DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy
 
 ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
 DOCKER_ENGINE_DEPENDENCIES += libapparmor
diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in
deleted file mode 100644
index 7e40536537..0000000000
--- a/package/docker-proxy/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config BR2_PACKAGE_DOCKER_PROXY
-	bool "docker-proxy"
-	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	help
-	  Libnetwork is a Container Network Model that provides a
-	  consistent programming interface and the required network
-	  abstractions for applications.
-
-	  This package provides docker-proxy, a run-time dependency of
-	  Docker.
-
-	  https://github.com/docker/libnetwork
-
-comment "docker-proxy needs a toolchain w/ threads"
-	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash
deleted file mode 100644
index 63296f14c1..0000000000
--- a/package/docker-proxy/docker-proxy.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256  05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204  docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz
-sha256  cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14  LICENSE
diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
deleted file mode 100644
index fe7982e8f6..0000000000
--- a/package/docker-proxy/docker-proxy.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# docker-proxy
-#
-################################################################################
-
-DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea
-DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION))
-
-DOCKER_PROXY_LICENSE = Apache-2.0
-DOCKER_PROXY_LICENSE_FILES = LICENSE
-
-DOCKER_PROXY_DEPENDENCIES = host-pkgconf
-
-DOCKER_PROXY_BUILD_TARGETS = cmd/proxy
-
-define DOCKER_PROXY_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy
-endef
-
-$(eval $(golang-package))
-- 
2.39.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 4/4] package/docker-cli: bump version to v23.0.0
  2023-02-03  3:44 [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Christian Stewart via buildroot
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 Christian Stewart via buildroot
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 3/4] package/docker-proxy: drop package Christian Stewart via buildroot
@ 2023-02-03  3:44 ` Christian Stewart via buildroot
  2023-02-03  7:39 ` [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Peter Korsgaard
  3 siblings, 0 replies; 6+ messages in thread
From: Christian Stewart via buildroot @ 2023-02-03  3:44 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

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
used by docker-engine. (Fixes a build error).

Signed-off-by: Christian Stewart <christian@paral.in>
---
 package/docker-cli/docker-cli.hash |  2 +-
 package/docker-cli/docker-cli.mk   | 15 ++++++++++++++-
 2 files changed, 15 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..3b155b5675 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,19 @@ DOCKER_CLI_TAGS += osusergo netgo
 DOCKER_CLI_GO_ENV = CGO_ENABLED=no
 endif
 
+# update the go module version to go1.19
+# docker-cli does not use go modules
+# remove the conflicting vendor/modules.txt
+# https://github.com/moby/moby/issues/44618#issuecomment-1343565705
+define DOCKER_CLI_CONFIGURE_CMDS
+	if [ -f $(@D)/vendor/modules.txt ]; then \
+		rm $(@D)/vendor/modules.txt; \
+	fi
+	cd $(@D); \
+		$(HOST_GO_HOST_ENV) $(DOCKER_CLI_GO_ENV) \
+		$(GO_BIN) mod edit -go=1.19 go.mod
+endef
+
 DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS))
 
 $(eval $(golang-package))
-- 
2.39.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16
  2023-02-03  3:44 [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Christian Stewart via buildroot
                   ` (2 preceding siblings ...)
  2023-02-03  3:44 ` [Buildroot] [PATCH v2 4/4] package/docker-cli: bump version to v23.0.0 Christian Stewart via buildroot
@ 2023-02-03  7:39 ` Peter Korsgaard
  3 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2023-02-03  7:39 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Yann E . MORIN, Thomas Petazzoni, buildroot

>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:

 > Bugfixes and improvements.
 > We now install the containerd.service systemd unit.

 > https://github.com/containerd/containerd/releases/tag/v1.6.16

 > Signed-off-by: Christian Stewart <christian@paral.in>

 > ---

 > v1 -> v2:

 >  - install containerd systemd unit (now required by docker-engine and others)

 > Signed-off-by: Christian Stewart <christian@paral.in>

Sorry, this is the commit I've applied, not v1.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-02-04 12:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-03  3:44 [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Christian Stewart via buildroot
2023-02-03  3:44 ` [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 Christian Stewart via buildroot
2023-02-04 12:56   ` Yann E. MORIN
2023-02-03  3:44 ` [Buildroot] [PATCH v2 3/4] package/docker-proxy: drop package Christian Stewart via buildroot
2023-02-03  3:44 ` [Buildroot] [PATCH v2 4/4] package/docker-cli: bump version to v23.0.0 Christian Stewart via buildroot
2023-02-03  7:39 ` [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox