Commit 1ffd81c4 authored by Konstantin Pavlov's avatar Konstantin Pavlov

Combine push and swarm targets in one.

parent 508e3f76
......@@ -3,7 +3,7 @@ REGISTRY := registry.videolan.org:5000
TAG := $(notdir $(CURDIR))
DATE := $(shell date +'%Y%m%d%H%M%S')
.PHONY: build push swarm
.PHONY: build push
all:
......@@ -15,7 +15,5 @@ push:
docker tag $(TAG):$(REVISION) $(REGISTRY)/$(TAG):$(DATE)
docker push $(REGISTRY)/$(TAG)
docker push $(REGISTRY)/$(TAG):$(DATE)
swarm:
docker $(SWARM) pull $(REGISTRY)/$(TAG)
docker $(SWARM) pull $(REGISTRY)/$(TAG):$(DATE)
......@@ -30,12 +30,10 @@ for b in $BASE; do
[ -d "$b" ] || continue
make -C $b build
make -C $b push
make -C $b swarm
done
for l in $LATE; do
[ -d "$l" ] || continue
make -C $l build
make -C $l push
make -C $l swarm
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment