clean up transfused build

Signed-off-by: Justin Cormack <justin@specialbusservice.com>

alpine/packages/Makefile

@@ -1,7 +1,7 @@
 all:
 	$(MAKE) -C proxy
 	$(MAKE) -C diagnostics
-	$(MAKE) -C transfused OS=linux
+	$(MAKE) -C transfused
 	$(MAKE) -C tap-vsockd
 	$(MAKE) -C hvtools
 	$(MAKE) -C docker

alpine/packages/transfused/Dockerfile

@@ -1,8 +1,9 @@
 FROM mobylinux/alpine-build-c:1b53976210ba819823eda5b1d0d3ea337772e97b
 
-RUN mkdir -p /transfused
-WORKDIR /transfused
-
 COPY . /transfused
 
-RUN make transfused
+WORKDIR /transfused
+
+RUN cc -g -static -Wall -Werror -o transfused transfused.c transfused_log.c transfused_vsock.c
+
+CMD ["tar", "cf", "-", "transfused"]

alpine/packages/transfused/Makefile

@@ -1,18 +1,8 @@
-.PHONY: all
-
-HDR=transfused.h transfused_log.h transfused_vsock.h
-SRC=transfused.c transfused_log.c transfused_vsock.c
-DEPS=$(HDR) $(SRC)
-
-
-all: Dockerfile $(DEPS)
-	docker build -t transfused:build .
-	docker run --rm transfused:build cat transfused > transfused
-	chmod 755 transfused
+DEPS=Dockerfile $(wildcard *.c *.h)
 
 transfused: $(DEPS)
-	gcc -g -static -Wall -Werror -o transfused $(SRC)
+	tar cf - $(DEPS) | docker build -t transfused:build -
+	docker run --rm --net=none transfused:build | tar xf -
 
 clean:
 	rm -f transfused
-	docker images -q transfused:build | xargs docker rmi -f || true

alpine/packages/transfused/transfused_vsock.c

@@ -3,7 +3,7 @@
 
 #include <sys/socket.h>
 
-#include "include/uapi/linux/vm_sockets.h"
+#include "vm_sockets.h"
 
 #include "transfused_log.h"