clean up 9pmount-vsock build

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-10 19:46:14 +01:00 committed by Justin Cormack
parent c52d04a248
commit e42d59045d
3 changed files with 10 additions and 22 deletions

View File

@ -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"]

View File

@ -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

View File

@ -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: