Skip to content

Commit

Permalink
remove --pull again from Makefile (zokradonh#162)
Browse files Browse the repository at this point in the history
doing docker build --pull messes with chained builds (base -> php -> webapp)

Signed-off-by: Felix Bartels <[email protected]>
  • Loading branch information
fbartels authored May 27, 2019
1 parent e4b391b commit b1b0485
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ ifdef TRAVIS
docker pull $(docker_repo)/kopano_$(component):builder || true
endif
docker build \
--pull \
--build-arg docker_repo=${docker_repo} \
--build-arg KOPANO_CORE_VERSION=${core_download_version} \
--build-arg KOPANO_$(COMPONENT)_VERSION=${$(component)_download_version} \
Expand Down Expand Up @@ -102,6 +101,7 @@ endif
-t $(docker_repo)/kopano_$(component):builder $(component)/

build-base:
docker pull debian:stretch
component=base make build

build-core: build-base
Expand Down

0 comments on commit b1b0485

Please sign in to comment.