clean up tap-vsockd build process

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-10 18:43:25 +01:00 committed by Justin Cormack
parent 98beff2fa0
commit 57d1e7e232
3 changed files with 10 additions and 25 deletions

View File

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

View File

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

View File

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