flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-07 07:56:12 +00:00
Code Issues Releases Wiki Activity

Remove printing of image size (does not work on Travis) (#252)

Browse Source 
* move repo definition outside of ifndef
This commit is contained in:
Felix Bartels 2019-10-07 15:45:24 +02:00 committed by GitHub
parent 1de183766d
commit a33458bd15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,8 +1,8 @@
SHELL := /bin/bash # Use bash syntax
docker_repo := zokradonh
# if not run in travis, get docker_login and _pwd from file
ifndef TRAVIS
docker_repo := zokradonh
docker_login := $(shell cat ~/.docker-account-user)
docker_pwd := $(shell cat ~/.docker-account-pwd)
endif
@ -70,7 +70,6 @@ endif
--build-arg ADDITIONAL_KOPANO_WEBAPP_PLUGINS=$(ADDITIONAL_KOPANO_WEBAPP_PLUGINS) \
--cache-from $(docker_repo)/kopano_$(component):builder \
-t $(docker_repo)/kopano_$(component) $(component)/
@echo "The image is $(shell docker image inspect $(docker_repo)/kopano_$(component) --format='{{.Size}}') bytes"
.PHONY: build-simple
build-simple: component ?= ssl
@ -79,8 +78,6 @@ build-simple: ## Helper target to build a simplified image (no Kopano repo integ
--build-arg VCS_REF=$(vcf_ref) \
--build-arg docker_repo=$(docker_repo) \
-t $(docker_repo)/kopano_$(component) $(component)/
@echo "The image is $(shell docker image inspect $(docker_repo)/kopano_$(component) --format='{{.Size}}') bytes"
.PHONY: build-builder
build-builder: component ?= kdav