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