package/docker-proxy: drop package

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 <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>

diff --git a/Config.in.legacy b/Config.in.legacy
index ad805224511e793fefca600ecd606d52a5f6b2d6..72deb03c35d4ae90a688792ac743d9ece4d588a6 100644 (file)
--- 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_PYTHON_BUNCH
        bool "python-bunch removed"
        select BR2_LEGACY

diff --git a/DEVELOPERS b/DEVELOPERS
index cad8d6affa3f8ef2adbcfb3ecb5c5a6144899ad4..f10036f7f25e5243422ab7313f8b129aed98c311 100644 (file)
--- 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 8b9570c44706c3ecfe21ef44b0b65629772b4c79..aa87f1305d246a3dca5e6dcfa458bb7e1c8f22f3 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -2618,7 +2618,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 1f0efb8fcc0ace6589c60e1a8f06fa2afd448881..b5a356eab94223c2517ff124dc759b0eae4a5bd2 100644 (file)
--- 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 c50f08245d9b72d075fc7d8aaebc26b5a3f62172..ca1aa27b0a7d521ba9c056da33fedc6878471ec5 100644 (file)
--- 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 (file)
index 7e40536..0000000
--- 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 (file)
index 63296f1..0000000
--- 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 (file)
index fe7982e..0000000
--- 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))