From 89fa310c00c2d08089e4b60e1cd78359aa62ae30 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Mon, 6 Oct 2014 19:34:12 +0100 Subject: [PATCH 1/3] Provide a way to bypass the use of sudo It's not necessary to be root to run "docker" commands, if your user is in the "docker" group. --- weaver/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/weaver/Makefile b/weaver/Makefile index e5d38884..e5c811d3 100644 --- a/weaver/Makefile +++ b/weaver/Makefile @@ -1,5 +1,8 @@ .DEFAULT: all +# If you can use docker with being root, you can do "make SUDO=" +SUDO=sudo + all: docker-image weaver: ../*.go main.go @@ -7,18 +10,17 @@ weaver: ../*.go main.go go build -ldflags '-extldflags "-static"' .PHONY: docker-image - docker-image: /tmp/weave.tar /tmp/weave.tar: Dockerfile weaver - sudo docker build -t zettio/weave . - sudo docker save zettio/weave > /tmp/weave.tar + $(SUDO) docker build -t zettio/weave . + $(SUDO) docker save zettio/weave > /tmp/weave.tar publish: docker-image - sudo docker tag zettio/weave zettio/weave:git-`git rev-parse --short=12 HEAD` - sudo docker push zettio/weave:latest - sudo docker push zettio/weave:git-`git rev-parse --short=12 HEAD` + $(SUDO) docker tag zettio/weave zettio/weave:git-`git rev-parse --short=12 HEAD` + $(SUDO) docker push zettio/weave:latest + $(SUDO) docker push zettio/weave:git-`git rev-parse --short=12 HEAD` clean: - -sudo docker rmi zettio/weave + -$(SUDO) docker rmi zettio/weave rm -f weaver /tmp/weave.tar From c4c06a2dc0417ea22a6d0d42da819194f04bde81 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Mon, 6 Oct 2014 19:35:24 +0100 Subject: [PATCH 2/3] Don't use /tmp for big files /tmp is on tmpfs on some systems, so it's better to use /var/tmp for large files. --- weaver/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/weaver/Makefile b/weaver/Makefile index e5c811d3..daec8d2b 100644 --- a/weaver/Makefile +++ b/weaver/Makefile @@ -10,11 +10,11 @@ weaver: ../*.go main.go go build -ldflags '-extldflags "-static"' .PHONY: docker-image -docker-image: /tmp/weave.tar +docker-image: /var/tmp/weave.tar -/tmp/weave.tar: Dockerfile weaver +/var/tmp/weave.tar: Dockerfile weaver $(SUDO) docker build -t zettio/weave . - $(SUDO) docker save zettio/weave > /tmp/weave.tar + $(SUDO) docker save zettio/weave > /var/tmp/weave.tar publish: docker-image $(SUDO) docker tag zettio/weave zettio/weave:git-`git rev-parse --short=12 HEAD` @@ -23,4 +23,4 @@ publish: docker-image clean: -$(SUDO) docker rmi zettio/weave - rm -f weaver /tmp/weave.tar + rm -f weaver /var/tmp/weave.tar From 399af7b0cb256d98327b3a91ac4c685b6c63a1d9 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Tue, 7 Oct 2014 14:43:07 +0100 Subject: [PATCH 3/3] Comment typo fix --- weaver/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weaver/Makefile b/weaver/Makefile index daec8d2b..772730c7 100644 --- a/weaver/Makefile +++ b/weaver/Makefile @@ -1,6 +1,6 @@ .DEFAULT: all -# If you can use docker with being root, you can do "make SUDO=" +# If you can use docker without being root, you can do "make SUDO=" SUDO=sudo all: docker-image