[checkmk-commits] Fix daily build

Module: check_mk Branch: master Commit: cf5d78f341cee81fb5ee5bdc10506c3a6dfdcf30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5d78f341cee8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 12 09:07:27 2019 +0100 Fix daily build Change-Id: I6d5bcad98cb97887588b34f896df5d71dca8363e --- docker/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/Makefile b/docker/Makefile index dd52782..64f8f82 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -49,8 +49,16 @@ setup: setversion: sed -i 's/^ARG CMK_VERSION=.*$$/ARG CMK_VERSION="$(NEW_VERSION)"/g' Dockerfile +# When executed by tests/docker/test_docker.py the update test creates a +# 1.5.0 container which needs the distro file from the 1.5.0 branch. In +# other build cases (e.g. during daily builds) we only have a source tar +# and no git repository. In this case simply use the available distro file. distro-%.mk: - git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ + if [ -d ../.git ]; then \ + git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ ; \ + else \ + cp ../omd/distros/DEBIAN_9.mk $@ ; \ + fi needed-packages-%: distro-%.mk echo -e '$@:\n\t@echo \$$(OS_PACKAGES) > $@\n' | \