From ac6a4ffecb70daa9d5aca5d1ee04d285a44b7aaf Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 22 Jun 2017 14:30:54 +0200 Subject: Move Dockerfile and internal script for ci to new ci/ folder. - Avoid artificial file suffix for Dockerfile. --- docker/vespa-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/vespa-ci.sh') diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index 2773a04b850..a70257ec2b1 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -22,6 +22,6 @@ docker build -t "$BUILD_DOCKER_IMAGE" -f Dockerfile.build . rm -rf tmp; mkdir tmp cp -p ../dist/vespa.spec tmp/vespa.spec -docker build -t "$CI_DOCKER_IMAGE" -f Dockerfile.ci . +docker build -t "$CI_DOCKER_IMAGE" -f ci/Dockerfile . docker run --rm -v ${DIR}/..:/vespa --entrypoint /vespa-ci-internal.sh "$CI_DOCKER_IMAGE" "$GIT_COMMIT" \ 2>&1 | tee vespa-ci-$(date +%Y-%m-%dT%H:%M:%S%z).log -- cgit v1.2.3