From 57d1e7e2321eb35bccd9d2dec8320e70f9a1a7db Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin@specialbusservice.com>
Date: Sat, 10 Sep 2016 18:43:25 +0100
Subject: [PATCH] clean up tap-vsockd build process

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
---
 alpine/packages/Makefile              |  2 +-
 alpine/packages/tap-vsockd/Dockerfile |  9 +++++----
 alpine/packages/tap-vsockd/Makefile   | 24 ++++--------------------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile
index 33abd7eb0..38bf95668 100644
--- a/alpine/packages/Makefile
+++ b/alpine/packages/Makefile
@@ -2,7 +2,7 @@ all:
 	$(MAKE) -C proxy
 	$(MAKE) -C diagnostics
 	$(MAKE) -C transfused OS=linux
-	$(MAKE) -C tap-vsockd OS=linux
+	$(MAKE) -C tap-vsockd
 	$(MAKE) -C hvtools OS=linux
 	$(MAKE) -C docker
 	$(MAKE) -C nc-vsock OS=linux
diff --git a/alpine/packages/tap-vsockd/Dockerfile b/alpine/packages/tap-vsockd/Dockerfile
index 4e5990dd0..093ef7887 100644
--- a/alpine/packages/tap-vsockd/Dockerfile
+++ b/alpine/packages/tap-vsockd/Dockerfile
@@ -1,8 +1,9 @@
 FROM mobylinux/alpine-build-c:1b53976210ba819823eda5b1d0d3ea337772e97b
 
-RUN mkdir -p /tap-vsockd
-WORKDIR /tap-vsockd
-
 COPY . /tap-vsockd
 
-RUN make tap-vsockd
+WORKDIR /tap-vsockd
+
+RUN gcc -Wall -Werror tap-vsockd.c hvsock.c protocol.c -lpthread -o tap-vsockd
+
+CMD ["tar", "cf", "-", "tap-vsockd"]
diff --git a/alpine/packages/tap-vsockd/Makefile b/alpine/packages/tap-vsockd/Makefile
index f0f3eb82e..5b330c4f6 100644
--- a/alpine/packages/tap-vsockd/Makefile
+++ b/alpine/packages/tap-vsockd/Makefile
@@ -1,24 +1,8 @@
-.PHONY: all
+DEPS=Dockerfile $(wildcard *.c *.h)
 
-DEPS=tap-vsockd.c hvsock.c hvsock.h protocol.c protocol.h
-
-all: Dockerfile $(DEPS)
-	docker build -t tap-vsockd:build .
-	docker run --rm tap-vsockd:build cat tap-vsockd > tap-vsockd
-	chmod 755 tap-vsockd
-
-tap-vsockd: hvsock.o protocol.o tap-vsockd.o
-	gcc -Wall -Werror -o tap-vsockd tap-vsockd.o protocol.o hvsock.o -lpthread
-
-hvsock.o: hvsock.c hvsock.h
-	gcc -Wall -Werror -c hvsock.c
-
-protocol.o: protocol.c
-	gcc -Wall -Werror -c protocol.c
-
-tap-vsockd.o: tap-vsockd.c hvsock.h
-	gcc -Wall -Werror -c tap-vsockd.c
+tap-vsockd: $(DEPS)
+	tar cf - $(DEPS) | docker build -t tap-vsockd:build -
+	docker run --rm --net=none tap-vsockd:build | tar xf -
 
 clean:
 	rm -f tap-vsockd
-	docker images -q tap-vsockd:build | xargs docker rmi -f || true