@@ -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
@@ -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/
@@ -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"
@@ -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,
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz
-sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE
deleted file mode 100644
@@ -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))
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