From be6ab94db4b5b6201e4b582d5fbf18321d35283d Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 14 Jan 2017 09:27:40 +0000 Subject: [PATCH] Remove unnecessary file from proxy Was missed in cleanup in #1006 Signed-off-by: Justin Cormack --- alpine/packages/proxy/Dockerfile | 12 ------------ alpine/packages/proxy/Makefile | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 alpine/packages/proxy/Dockerfile diff --git a/alpine/packages/proxy/Dockerfile b/alpine/packages/proxy/Dockerfile deleted file mode 100644 index 7de60fad9..000000000 --- a/alpine/packages/proxy/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -# Tag: 2c9434f1c4ff70b102f34a97d2df1a8363a11a65 -FROM mobylinux/alpine-build-go@sha256:d528bbf7102e4209bd59ef030d41de9003ab8e42c303956f62b2df47f3e17849 - -COPY ./ /go/src/proxy/ - -WORKDIR /go/src/proxy - -RUN lint.sh . - -RUN go install --ldflags '-extldflags "-fno-PIC"' - -CMD ["tar", "cf", "-", "-C", "/go/bin", "proxy"] diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index 5db3a144d..02ccd4b13 100644 --- a/alpine/packages/proxy/Makefile +++ b/alpine/packages/proxy/Makefile @@ -3,7 +3,7 @@ GO_COMPILE=mobylinux/go-compile@sha256:b723c0e95a6293300392e57d6ab52574f9217e241 all: usr/bin/slirp-proxy sbin/proxy-vsockd -DEPS=Dockerfile $(wildcard *.go libproxy/*.go) +DEPS=$(wildcard *.go libproxy/*.go) proxy: $(DEPS) ../vendor/manifest tar cf - $(DEPS) -C .. vendor | docker run --rm --net=none --log-driver=none -i $(GO_COMPILE) -o $@ | tar xf -