From fb895264989267dffc521b05eeb77bf71e6a6b50 Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Thu, 14 Apr 2016 14:38:46 +0100
Subject: [PATCH] proxy: simply the Dockerfile by shuffling code under vendor/

Note there is a slight name clash between the final binary 'proxy'
and the library formerly known as 'proxy'. Resolve this by calling
the library 'libproxy'.

Signed-off-by: David Scott <dave.scott@docker.com>
---
 alpine/packages/proxy/Dockerfile                           | 7 +------
 alpine/packages/proxy/main.go                              | 4 ++--
 alpine/packages/proxy/proxy.go                             | 4 ++--
 .../{pkg/proxy => vendor/libproxy}/network_proxy_test.go   | 2 +-
 .../packages/proxy/{pkg/proxy => vendor/libproxy}/proxy.go | 2 +-
 .../proxy/{pkg/proxy => vendor/libproxy}/stub_proxy.go     | 2 +-
 .../proxy/{pkg/proxy => vendor/libproxy}/tcp_proxy.go      | 2 +-
 .../proxy/{pkg/proxy => vendor/libproxy}/udp_proxy.go      | 2 +-
 8 files changed, 10 insertions(+), 15 deletions(-)
 rename alpine/packages/proxy/{pkg/proxy => vendor/libproxy}/network_proxy_test.go (99%)
 rename alpine/packages/proxy/{pkg/proxy => vendor/libproxy}/proxy.go (98%)
 rename alpine/packages/proxy/{pkg/proxy => vendor/libproxy}/stub_proxy.go (97%)
 rename alpine/packages/proxy/{pkg/proxy => vendor/libproxy}/tcp_proxy.go (99%)
 rename alpine/packages/proxy/{pkg/proxy => vendor/libproxy}/udp_proxy.go (99%)

diff --git a/alpine/packages/proxy/Dockerfile b/alpine/packages/proxy/Dockerfile
index 98054e0cf..d38c03bfe 100644
--- a/alpine/packages/proxy/Dockerfile
+++ b/alpine/packages/proxy/Dockerfile
@@ -3,12 +3,7 @@ FROM golang:alpine
 RUN mkdir -p /go/src/proxy
 WORKDIR /go/src/proxy
 
-COPY * /go/src/proxy/
-
-RUN mkdir -p /go/src/pkg/proxy
-COPY pkg/* /go/src/pkg/proxy/
-RUN mkdir -p /go/src/vendor/github.com/Sirupsen/logrus
-COPY vendor/github.com/Sirupsen/logrus/* /go/src/vendor/github.com/Sirupsen/logrus/
+COPY ./ /go/src/proxy/
 
 ARG GOARCH
 ARG GOOS
diff --git a/alpine/packages/proxy/main.go b/alpine/packages/proxy/main.go
index 78fc7c13f..19bbd7b85 100644
--- a/alpine/packages/proxy/main.go
+++ b/alpine/packages/proxy/main.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net"
 	"os"
-	"pkg/proxy"
+	"libproxy"
 	"strings"
 )
 
@@ -17,7 +17,7 @@ func main() {
 	if err != nil {
 		sendError(err)
 	}
-	p, err := proxy.NewProxy(host, container)
+	p, err := libproxy.NewProxy(host, container)
 	if err != nil {
 		unexposePort(host)
 		sendError(err)
diff --git a/alpine/packages/proxy/proxy.go b/alpine/packages/proxy/proxy.go
index f730bc22e..0724f0c52 100644
--- a/alpine/packages/proxy/proxy.go
+++ b/alpine/packages/proxy/proxy.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"pkg/proxy"
+	"libproxy"
 )
 
 // sendError signals the error to the parent and quits the process.
@@ -59,7 +59,7 @@ func parseHostContainerAddrs() (host net.Addr, port int, container net.Addr) {
 	return host, port, container
 }
 
-func handleStopSignals(p proxy.Proxy) {
+func handleStopSignals(p libproxy.Proxy) {
 	s := make(chan os.Signal, 10)
 	signal.Notify(s, os.Interrupt, syscall.SIGTERM, syscall.SIGSTOP)
 
diff --git a/alpine/packages/proxy/pkg/proxy/network_proxy_test.go b/alpine/packages/proxy/vendor/libproxy/network_proxy_test.go
similarity index 99%
rename from alpine/packages/proxy/pkg/proxy/network_proxy_test.go
rename to alpine/packages/proxy/vendor/libproxy/network_proxy_test.go
index 9e382567c..f4458939f 100644
--- a/alpine/packages/proxy/pkg/proxy/network_proxy_test.go
+++ b/alpine/packages/proxy/vendor/libproxy/network_proxy_test.go
@@ -1,4 +1,4 @@
-package proxy
+package libproxy
 
 import (
 	"bytes"
diff --git a/alpine/packages/proxy/pkg/proxy/proxy.go b/alpine/packages/proxy/vendor/libproxy/proxy.go
similarity index 98%
rename from alpine/packages/proxy/pkg/proxy/proxy.go
rename to alpine/packages/proxy/vendor/libproxy/proxy.go
index 4e24e5f6a..b825b972a 100644
--- a/alpine/packages/proxy/pkg/proxy/proxy.go
+++ b/alpine/packages/proxy/vendor/libproxy/proxy.go
@@ -1,6 +1,6 @@
 // Package proxy provides a network Proxy interface and implementations for TCP
 // and UDP.
-package proxy
+package libproxy
 
 import (
 	"fmt"
diff --git a/alpine/packages/proxy/pkg/proxy/stub_proxy.go b/alpine/packages/proxy/vendor/libproxy/stub_proxy.go
similarity index 97%
rename from alpine/packages/proxy/pkg/proxy/stub_proxy.go
rename to alpine/packages/proxy/vendor/libproxy/stub_proxy.go
index 571749e46..97a4d3f58 100644
--- a/alpine/packages/proxy/pkg/proxy/stub_proxy.go
+++ b/alpine/packages/proxy/vendor/libproxy/stub_proxy.go
@@ -1,4 +1,4 @@
-package proxy
+package libproxy
 
 import (
 	"net"
diff --git a/alpine/packages/proxy/pkg/proxy/tcp_proxy.go b/alpine/packages/proxy/vendor/libproxy/tcp_proxy.go
similarity index 99%
rename from alpine/packages/proxy/pkg/proxy/tcp_proxy.go
rename to alpine/packages/proxy/vendor/libproxy/tcp_proxy.go
index 3cd742af7..5a8bc1292 100644
--- a/alpine/packages/proxy/pkg/proxy/tcp_proxy.go
+++ b/alpine/packages/proxy/vendor/libproxy/tcp_proxy.go
@@ -1,4 +1,4 @@
-package proxy
+package libproxy
 
 import (
 	"io"
diff --git a/alpine/packages/proxy/pkg/proxy/udp_proxy.go b/alpine/packages/proxy/vendor/libproxy/udp_proxy.go
similarity index 99%
rename from alpine/packages/proxy/pkg/proxy/udp_proxy.go
rename to alpine/packages/proxy/vendor/libproxy/udp_proxy.go
index b8375c374..7b59466b0 100644
--- a/alpine/packages/proxy/pkg/proxy/udp_proxy.go
+++ b/alpine/packages/proxy/vendor/libproxy/udp_proxy.go
@@ -1,4 +1,4 @@
-package proxy
+package libproxy
 
 import (
 	"encoding/binary"