From 206dfe0950014154da7c8d9e17f54afb1bce3879 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 11 Sep 2016 23:49:36 +0100 Subject: [PATCH] simplify vendor tar Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/Makefile | 2 +- alpine/packages/proxy/Makefile | 2 +- alpine/packages/vsudd/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile index 6be88f03e..b296d5485 100644 --- a/alpine/packages/diagnostics/Makefile +++ b/alpine/packages/diagnostics/Makefile @@ -3,7 +3,7 @@ all: usr/bin/diagnostics-server DEPS=Dockerfile $(wildcard *.go) usr/bin/diagnostics-server: $(DEPS) ../vendor/manifest - tar cf - $(DEPS) -C .. $(shell cd .. && find vendor) | docker build -t diagnostics-server:build - + tar cf - $(DEPS) -C .. vendor | docker build -t diagnostics-server:build - docker run --rm --net=none diagnostics-server:build | tar xf - -C usr/bin clean: diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index d4a54051d..a0d58c19d 100644 --- a/alpine/packages/proxy/Makefile +++ b/alpine/packages/proxy/Makefile @@ -3,7 +3,7 @@ all: usr/bin/slirp-proxy sbin/proxy-vsockd DEPS=Dockerfile $(wildcard *.go libproxy/*.go) proxy: $(DEPS) ../vendor/manifest - tar cf - $(DEPS) -C .. $(shell cd .. && find vendor) | docker build -t proxy:build - + tar cf - $(DEPS) -C .. vendor | docker build -t proxy:build - docker run --rm --net=none proxy:build | tar xf - usr/bin/slirp-proxy: proxy diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index 93c3dec0a..6189b7fb5 100644 --- a/alpine/packages/vsudd/Makefile +++ b/alpine/packages/vsudd/Makefile @@ -4,7 +4,7 @@ DEPS=Dockerfile $(wildcard *.go) vsudd: $(DEPS) ../vendor/manifest mkdir -p sbin - tar cf - $(DEPS) -C .. $(shell cd .. && find vendor) | docker build -t vsudd:build - + tar cf - $(DEPS) -C .. vendor | docker build -t vsudd:build - docker run --rm --net=none vsudd:build | tar xf - -C sbin clean: