From e7cf711c022fed4f1dc3cb6af1be9987b3bd65ba Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 18 Jun 2021 21:38:50 +0000 Subject: [PATCH] Move proxy CLI to main cmd/ Since this command is part of the official distribution and even required for tests, let's move this up to the main cmd's. Signed-off-by: Brian Goff --- {libnetwork/cmd/proxy => cmd/docker-proxy}/main.go | 0 .../cmd/proxy => cmd/docker-proxy}/network_proxy_test.go | 0 {libnetwork/cmd/proxy => cmd/docker-proxy}/proxy.go | 0 {libnetwork/cmd/proxy => cmd/docker-proxy}/sctp_proxy.go | 0 {libnetwork/cmd/proxy => cmd/docker-proxy}/tcp_proxy.go | 0 {libnetwork/cmd/proxy => cmd/docker-proxy}/udp_proxy.go | 0 hack/make/binary-proxy | 2 +- hack/make/dynbinary-proxy | 2 +- 8 files changed, 2 insertions(+), 2 deletions(-) rename {libnetwork/cmd/proxy => cmd/docker-proxy}/main.go (100%) rename {libnetwork/cmd/proxy => cmd/docker-proxy}/network_proxy_test.go (100%) rename {libnetwork/cmd/proxy => cmd/docker-proxy}/proxy.go (100%) rename {libnetwork/cmd/proxy => cmd/docker-proxy}/sctp_proxy.go (100%) rename {libnetwork/cmd/proxy => cmd/docker-proxy}/tcp_proxy.go (100%) rename {libnetwork/cmd/proxy => cmd/docker-proxy}/udp_proxy.go (100%) diff --git a/libnetwork/cmd/proxy/main.go b/cmd/docker-proxy/main.go similarity index 100% rename from libnetwork/cmd/proxy/main.go rename to cmd/docker-proxy/main.go diff --git a/libnetwork/cmd/proxy/network_proxy_test.go b/cmd/docker-proxy/network_proxy_test.go similarity index 100% rename from libnetwork/cmd/proxy/network_proxy_test.go rename to cmd/docker-proxy/network_proxy_test.go diff --git a/libnetwork/cmd/proxy/proxy.go b/cmd/docker-proxy/proxy.go similarity index 100% rename from libnetwork/cmd/proxy/proxy.go rename to cmd/docker-proxy/proxy.go diff --git a/libnetwork/cmd/proxy/sctp_proxy.go b/cmd/docker-proxy/sctp_proxy.go similarity index 100% rename from libnetwork/cmd/proxy/sctp_proxy.go rename to cmd/docker-proxy/sctp_proxy.go diff --git a/libnetwork/cmd/proxy/tcp_proxy.go b/cmd/docker-proxy/tcp_proxy.go similarity index 100% rename from libnetwork/cmd/proxy/tcp_proxy.go rename to cmd/docker-proxy/tcp_proxy.go diff --git a/libnetwork/cmd/proxy/udp_proxy.go b/cmd/docker-proxy/udp_proxy.go similarity index 100% rename from libnetwork/cmd/proxy/udp_proxy.go rename to cmd/docker-proxy/udp_proxy.go diff --git a/hack/make/binary-proxy b/hack/make/binary-proxy index c0270fed9e..287a86e09d 100644 --- a/hack/make/binary-proxy +++ b/hack/make/binary-proxy @@ -3,7 +3,7 @@ set -e ( - GO_PACKAGE='github.com/docker/docker/libnetwork/cmd/proxy' + GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy' BINARY_SHORT_NAME='docker-proxy' source "${MAKEDIR}/.binary" diff --git a/hack/make/dynbinary-proxy b/hack/make/dynbinary-proxy index e97a15b311..3e16676061 100644 --- a/hack/make/dynbinary-proxy +++ b/hack/make/dynbinary-proxy @@ -9,7 +9,7 @@ set -e export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here - GO_PACKAGE='github.com/docker/docker/libnetwork/cmd/proxy' + GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy' BINARY_SHORT_NAME='docker-proxy' source "${MAKEDIR}/.binary" )