diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile index 7caaa1365..49339542b 100644 --- a/alpine/packages/Makefile +++ b/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 diff --git a/alpine/packages/transfused/Dockerfile b/alpine/packages/transfused/Dockerfile index 1a9458ac4..f075309fe 100644 --- a/alpine/packages/transfused/Dockerfile +++ b/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"] diff --git a/alpine/packages/transfused/Makefile b/alpine/packages/transfused/Makefile index d1bfc5fa3..34e1e57f0 100644 --- a/alpine/packages/transfused/Makefile +++ b/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 diff --git a/alpine/packages/transfused/transfused_vsock.c b/alpine/packages/transfused/transfused_vsock.c index 25e0219dd..08408dd0e 100644 --- a/alpine/packages/transfused/transfused_vsock.c +++ b/alpine/packages/transfused/transfused_vsock.c @@ -3,7 +3,7 @@ #include -#include "include/uapi/linux/vm_sockets.h" +#include "vm_sockets.h" #include "transfused_log.h" diff --git a/alpine/packages/transfused/include/uapi/linux/vm_sockets.h b/alpine/packages/transfused/vm_sockets.h similarity index 100% rename from alpine/packages/transfused/include/uapi/linux/vm_sockets.h rename to alpine/packages/transfused/vm_sockets.h