From e42d59045d12ce7baa722d06f9bebcce6847c824 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 10 Sep 2016 19:46:14 +0100 Subject: [PATCH] clean up 9pmount-vsock build Signed-off-by: Justin Cormack --- alpine/packages/9pmount-vsock/Dockerfile | 9 +++++---- alpine/packages/9pmount-vsock/Makefile | 21 ++++----------------- alpine/packages/Makefile | 2 +- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/alpine/packages/9pmount-vsock/Dockerfile b/alpine/packages/9pmount-vsock/Dockerfile index ae76d2d2d..5b5635555 100644 --- a/alpine/packages/9pmount-vsock/Dockerfile +++ b/alpine/packages/9pmount-vsock/Dockerfile @@ -1,8 +1,9 @@ FROM mobylinux/alpine-build-c:1b53976210ba819823eda5b1d0d3ea337772e97b -RUN mkdir -p /9pmount-vsock -WORKDIR /9pmount-vsock - COPY . /9pmount-vsock -RUN make 9pmount-vsock +WORKDIR /9pmount-vsock + +RUN cc -Wall -Werror 9pmount-vsock.c hvsock.c -lpthread -o 9pmount-vsock + +CMD ["tar", "cf", "-", "9pmount-vsock"] diff --git a/alpine/packages/9pmount-vsock/Makefile b/alpine/packages/9pmount-vsock/Makefile index 653d84bc1..595a82e92 100644 --- a/alpine/packages/9pmount-vsock/Makefile +++ b/alpine/packages/9pmount-vsock/Makefile @@ -1,21 +1,8 @@ -.PHONY: all +DEPS=Dockerfile $(wildcard *.c *.h) -DEPS=9pmount-vsock.c hvsock.c hvsock.h - -all: Dockerfile $(DEPS) - docker build -t 9pmount-vsock:build . - docker run --rm 9pmount-vsock:build cat 9pmount-vsock > 9pmount-vsock - chmod 755 9pmount-vsock - -9pmount-vsock: 9pmount-vsock.o hvsock.o - gcc -Wall -Werror -o 9pmount-vsock 9pmount-vsock.o hvsock.o -lpthread - -9pmount-vsock.o: 9pmount-vsock.c hvsock.h - gcc -Wall -Werror -c 9pmount-vsock.c - -hvsock.o: hvsock.c hvsock.h - gcc -Wall -Werror -c hvsock.c +9pmount-vsock: $(DEPS) + tar cf - $(DEPS) | docker build -t 9pmount-vsock:build - + docker run --rm --net=none 9pmount-vsock:build | tar xf - clean: rm -f 9pmount-vsock - docker images -q 9pmount-vsock:build | xargs docker rmi -f || true diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile index 80df78831..126c14794 100644 --- a/alpine/packages/Makefile +++ b/alpine/packages/Makefile @@ -7,7 +7,7 @@ all: $(MAKE) -C docker $(MAKE) -C nc-vsock OS=linux $(MAKE) -C vsudd - $(MAKE) -C 9pmount-vsock OS=linux + $(MAKE) -C 9pmount-vsock $(MAKE) -C iptables clean: