1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-22 13:52:56 +00:00

add kweb config for z-push (#419)

* add kweb config for z-push
* clean out apache bits from z-push container and use kopano_php as the base
* fix commander tests for current php version
* globally define log location for php-fpm error_log
* move port in outer kweb config
* rewrite other spellings of the autodiscover url
* fix port in startup test
* force plain output to buildkit
* reorder z-push dockerfile
This commit is contained in:
Felix Bartels
2020-07-21 12:48:33 +02:00
committed by GitHub
parent 45cb9bbd86
commit e2251036b3
11 changed files with 68 additions and 63 deletions
+2 -2
View File
@@ -60,7 +60,7 @@ endif
ifeq (,$(wildcard ./apt_auth.conf))
touch apt_auth.conf
endif
DOCKER_BUILDKIT=1 docker build --rm \
BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 docker build --rm \
--build-arg VCS_REF=$(vcs_ref) \
--build-arg docker_repo=${docker_repo} \
--build-arg KOPANO_CORE_VERSION=${core_download_version} \
@@ -99,7 +99,7 @@ ifdef TRAVIS
@echo "fetching previous build to warm up build cache (only on travis)"
docker pull $(docker_repo)/kopano_$(component):builder || true
endif
DOCKER_BUILDKIT=1 docker build --rm \
BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 docker build --rm \
--target builder \
--build-arg VCS_REF=$(vcf_ref) \
--build-arg docker_repo=${docker_repo} \