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.
This commit is contained in:
1 parent
e7e7de2173
commit
89fa310c00
1 file changed
+9
-7
+9
-7
@@ -1,5 +1,8 @@
|
|||||||
.DEFAULT: all
|
.DEFAULT: all
|
||||||
|
|
||||||
|
# If you can use docker with being root, you can do "make SUDO="
|
||||||
|
SUDO=sudo
|
||||||
|
|
||||||
all: docker-image
|
all: docker-image
|
||||||
|
|
||||||
weaver: ../*.go main.go
|
weaver: ../*.go main.go
|
||||||
@@ -7,18 +10,17 @@ weaver: ../*.go main.go
|
|||||||
go build -ldflags '-extldflags "-static"'
|
go build -ldflags '-extldflags "-static"'
|
||||||
|
|
||||||
.PHONY: docker-image
|
.PHONY: docker-image
|
||||||
|
|
||||||
docker-image: /tmp/weave.tar
|
docker-image: /tmp/weave.tar
|
||||||
|
|
||||||
/tmp/weave.tar: Dockerfile weaver
|
/tmp/weave.tar: Dockerfile weaver
|
||||||
sudo docker build -t zettio/weave .
|
$(SUDO) docker build -t zettio/weave .
|
||||||
sudo docker save zettio/weave > /tmp/weave.tar
|
$(SUDO) docker save zettio/weave > /tmp/weave.tar
|
||||||
|
|
||||||
publish: docker-image
|
publish: docker-image
|
||||||
sudo docker tag zettio/weave 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:latest
|
||||||
sudo docker push zettio/weave:git-`git rev-parse --short=12 HEAD`
|
$(SUDO) docker push zettio/weave:git-`git rev-parse --short=12 HEAD`
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-sudo docker rmi zettio/weave
|
-$(SUDO) docker rmi zettio/weave
|
||||||
rm -f weaver /tmp/weave.tar
|
rm -f weaver /tmp/weave.tar
|
||||||
Reference in new issue
Block a user