From b06a5fa6ebb0125801c4f3047eeaf2f7e9b5077e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 10 Sep 2016 19:56:16 +0100 Subject: [PATCH] clean up nc-vsock build Signed-off-by: Justin Cormack --- alpine/packages/Makefile | 2 +- alpine/packages/nc-vsock/Dockerfile | 9 +++++---- alpine/packages/nc-vsock/Makefile | 13 +++---------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile index 126c14794..7caaa1365 100644 --- a/alpine/packages/Makefile +++ b/alpine/packages/Makefile @@ -5,7 +5,7 @@ all: $(MAKE) -C tap-vsockd $(MAKE) -C hvtools $(MAKE) -C docker - $(MAKE) -C nc-vsock OS=linux + $(MAKE) -C nc-vsock $(MAKE) -C vsudd $(MAKE) -C 9pmount-vsock $(MAKE) -C iptables diff --git a/alpine/packages/nc-vsock/Dockerfile b/alpine/packages/nc-vsock/Dockerfile index e6cedd3a9..bf27c4854 100644 --- a/alpine/packages/nc-vsock/Dockerfile +++ b/alpine/packages/nc-vsock/Dockerfile @@ -1,8 +1,9 @@ FROM mobylinux/alpine-build-c:1b53976210ba819823eda5b1d0d3ea337772e97b -RUN mkdir -p /nc-vsock -WORKDIR /nc-vsock - COPY . /nc-vsock -RUN make nc-vsock +WORKDIR /nc-vsock + +RUN cc -Wall -Werror -o nc-vsock nc-vsock.c -luuid + +CMD ["tar", "cf", "-", "nc-vsock"] diff --git a/alpine/packages/nc-vsock/Makefile b/alpine/packages/nc-vsock/Makefile index 469721faa..0bc2d2d1b 100644 --- a/alpine/packages/nc-vsock/Makefile +++ b/alpine/packages/nc-vsock/Makefile @@ -1,15 +1,8 @@ -.PHONY: all - -DEPS=nc-vsock.c - -all: Dockerfile $(DEPS) - docker build -t nc-vsock:build . - docker run --rm nc-vsock:build cat nc-vsock > nc-vsock - chmod 755 nc-vsock +DEPS=Dockerfile $(wildcard *.c *.h) nc-vsock: $(DEPS) - gcc -Wall -Werror -o nc-vsock nc-vsock.c -luuid + tar cf - $(DEPS) | docker build -t nc-vsock:build - + docker run --rm --net=none nc-vsock:build | tar xf - clean: rm -f nc-vsock - docker images -q nc-vsock:build | xargs docker rmi -f || true