jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build crash

Browse source
This commit is contained in:
Alexey Golubev 2016-07-27 15:24:47 +03:00 committed by GitHub
parent 8ec2fe79a5
commit 421b24c01c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,4 +1,4 @@
PACKAGE_VERSION := $(PRODUCT_VERSION).$(BUILD_NUMBER) PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
ifeq ($(GIT_BRANCH), origin/develop) ifeq ($(GIT_BRANCH), origin/develop)
DOCKER_TAGS += $(PACKAGE_VERSION) DOCKER_TAGS += $(PACKAGE_VERSION)
@ -18,7 +18,7 @@ $(DOCKER_TARGETS): $(DEB_REPO_DATA)
sed "s|{{GIT_BRANCH}}|$(GIT_BRANCH)|" -i Dockerfile sed "s|{{GIT_BRANCH}}|$(GIT_BRANCH)|" -i Dockerfile
sed 's/{{PACKAGE_VERSION}}/'$(PACKAGE_VERSION)'/' -i Dockerfile sed 's/{{PACKAGE_VERSION}}/'$(PACKAGE_VERSION)'/' -i Dockerfile
sudo docker build -t $(subst $(COLON),:,$@) . &&\ sudo docker build -t $(subst -,.,$(subst $(COLON),:,$@)) . &&\
mkdir -p $$(dirname $@) &&\ mkdir -p $$(dirname $@) &&\
echo "Done" > $@ echo "Done" > $@
@ -31,4 +31,4 @@ clean-docker:
sudo docker rmi -f $$(sudo docker images -q $(COMPANY_NAME)/*) || exit 0 sudo docker rmi -f $$(sudo docker images -q $(COMPANY_NAME)/*) || exit 0
deploy: $(DOCKER_TARGETS) deploy: $(DOCKER_TARGETS)
$(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst $(COLON),:,$(TARGET));) $(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst -,.,$(subst $(COLON),:,$(TARGET)));)