From 5c634808df7ece851d39feddee4b4ea812d6293f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 10 Sep 2016 23:31:42 +0100 Subject: [PATCH] simplify tar for vendor directory Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/.gitignore | 3 +-- alpine/packages/diagnostics/Makefile | 11 ++++------- alpine/packages/proxy/.gitignore | 1 - alpine/packages/proxy/Makefile | 12 ++++-------- alpine/packages/vsudd/.gitignore | 1 - alpine/packages/vsudd/Makefile | 11 ++++------- 6 files changed, 13 insertions(+), 26 deletions(-) diff --git a/alpine/packages/diagnostics/.gitignore b/alpine/packages/diagnostics/.gitignore index 826049f6e..bb212fdf6 100644 --- a/alpine/packages/diagnostics/.gitignore +++ b/alpine/packages/diagnostics/.gitignore @@ -1,2 +1 @@ -diagnostics-server -files +usr/bin/diagnostics-server diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile index f2d5d6749..6be88f03e 100644 --- a/alpine/packages/diagnostics/Makefile +++ b/alpine/packages/diagnostics/Makefile @@ -1,15 +1,12 @@ all: usr/bin/diagnostics-server -files: - ls Dockerfile *.go > files - printf -- '-C\n..\n' >> files - (cd .. && find vendor) >> files +DEPS=Dockerfile $(wildcard *.go) -usr/bin/diagnostics-server: Dockerfile $(wildcard *.go) ../vendor/manifest files - tar cf - -T files | docker build -t diagnostics-server:build - +usr/bin/diagnostics-server: $(DEPS) ../vendor/manifest + tar cf - $(DEPS) -C .. $(shell cd .. && find vendor) | docker build -t diagnostics-server:build - docker run --rm --net=none diagnostics-server:build | tar xf - -C usr/bin clean: - rm -f usr/bin/diagnostics-server files + rm -f usr/bin/diagnostics-server .DELETE_ON_ERROR: diff --git a/alpine/packages/proxy/.gitignore b/alpine/packages/proxy/.gitignore index 943135763..5ae715395 100644 --- a/alpine/packages/proxy/.gitignore +++ b/alpine/packages/proxy/.gitignore @@ -1,4 +1,3 @@ proxy -files usr/ sbin/ diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index c676cd4ee..d4a54051d 100644 --- a/alpine/packages/proxy/Makefile +++ b/alpine/packages/proxy/Makefile @@ -1,13 +1,9 @@ all: usr/bin/slirp-proxy sbin/proxy-vsockd -files: - ls Dockerfile *.go > files - find libproxy >> files - printf -- '-C\n..\n' >> files - (cd .. && find vendor) >> files +DEPS=Dockerfile $(wildcard *.go libproxy/*.go) -proxy: Dockerfile $(wildcard *.go libproxy/*.go) ../vendor/manifest files - tar cf - -T files | docker build -t proxy:build - +proxy: $(DEPS) ../vendor/manifest + tar cf - $(DEPS) -C .. $(shell cd .. && find vendor) | docker build -t proxy:build - docker run --rm --net=none proxy:build | tar xf - usr/bin/slirp-proxy: proxy @@ -19,6 +15,6 @@ sbin/proxy-vsockd: proxy cp proxy $@ clean: - rm -rf proxy files sbin usr + rm -rf proxy sbin usr .DELETE_ON_ERROR: diff --git a/alpine/packages/vsudd/.gitignore b/alpine/packages/vsudd/.gitignore index e7258a57d..5b42612bc 100644 --- a/alpine/packages/vsudd/.gitignore +++ b/alpine/packages/vsudd/.gitignore @@ -1,2 +1 @@ -files sbin/ diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index 66cd1389d..93c3dec0a 100644 --- a/alpine/packages/vsudd/Makefile +++ b/alpine/packages/vsudd/Makefile @@ -1,16 +1,13 @@ all: vsudd -files: - ls Dockerfile *.go > files - printf -- '-C\n..\n' >> files - (cd .. && find vendor) >> files +DEPS=Dockerfile $(wildcard *.go) -vsudd: Dockerfile $(wildcard *.go) ../vendor/manifest files +vsudd: $(DEPS) ../vendor/manifest mkdir -p sbin - tar cf - -T files | docker build -t vsudd:build - + tar cf - $(DEPS) -C .. $(shell cd .. && find vendor) | docker build -t vsudd:build - docker run --rm --net=none vsudd:build | tar xf - -C sbin clean: - rm -rf sbin files + rm -rf sbin .DELETE_ON_ERROR: