mirror of
https://github.com/zokradonh/kopano-docker
synced 2025-06-08 00:16:22 +00:00
Merge branch 'master' into compose
This commit is contained in:
commit
c44017b3e3
7
Makefile
7
Makefile
@ -3,14 +3,19 @@ docker_login := `cat ~/.docker-account-user`
|
|||||||
docker_pwd := `cat ~/.docker-account-pwd`
|
docker_pwd := `cat ~/.docker-account-pwd`
|
||||||
|
|
||||||
base_version = $(shell docker run --rm $(docker_repo)/kopano_base cat /kopano/buildversion)
|
base_version = $(shell docker run --rm $(docker_repo)/kopano_base cat /kopano/buildversion)
|
||||||
|
base_download_version = $(shell ./version.sh core)
|
||||||
core_version = $(shell docker run --rm $(docker_repo)/kopano_core cat /kopano/buildversion | grep -o -P '(?<=-).*(?=_)')
|
core_version = $(shell docker run --rm $(docker_repo)/kopano_core cat /kopano/buildversion | grep -o -P '(?<=-).*(?=_)')
|
||||||
|
core_download_version = $(shell ./version.sh core)
|
||||||
webapp_version = $(shell docker run --rm $(docker_repo)/kopano_webapp cat /kopano/buildversion | tail -n 1 | grep -o -P '(?<=-).*(?=\+)')
|
webapp_version = $(shell docker run --rm $(docker_repo)/kopano_webapp cat /kopano/buildversion | tail -n 1 | grep -o -P '(?<=-).*(?=\+)')
|
||||||
|
webapp_download_version = $(shell ./version.sh webapp)
|
||||||
|
|
||||||
|
COMPONENT = $(shell echo $(component) | tr a-z A-Z)
|
||||||
|
|
||||||
build-all: build-base build-core build-webapp
|
build-all: build-base build-core build-webapp
|
||||||
|
|
||||||
build: component ?= base
|
build: component ?= base
|
||||||
build:
|
build:
|
||||||
docker build -t $(docker_repo)/kopano_$(component) $(component)/
|
docker build --build-arg KOPANO_$(COMPONENT)_VERSION=${$(component)_download_version} -t $(docker_repo)/kopano_$(component) $(component)/
|
||||||
|
|
||||||
build-base:
|
build-base:
|
||||||
component=base make build
|
component=base make build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user