diff options
| author | gjoranv <gv@yahoo-inc.com> | 2017-06-22 14:30:54 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahoo-inc.com> | 2017-06-22 14:36:38 +0200 |
| commit | ac6a4ffecb70daa9d5aca5d1ee04d285a44b7aaf (patch) | |
| tree | 2f3af2364f14bd59ef446067f8f4399289edfad2 /docker | |
| parent | fd3dff817f19548caef8f1c9e9b0504f6937ee85 (diff) | |
Move Dockerfile and internal script for ci to new ci/ folder.
- Avoid artificial file suffix for Dockerfile.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ci/Dockerfile (renamed from docker/Dockerfile.ci) | 2 | ||||
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh (renamed from docker/vespa-ci-internal.sh) | 0 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile.ci b/docker/ci/Dockerfile index 0bd34978621..fc2e3ffe666 100644 --- a/docker/Dockerfile.ci +++ b/docker/ci/Dockerfile @@ -12,4 +12,4 @@ USER vespabuilder # Java requires proper locale for unicode ENV LANG en_US.UTF-8 -COPY vespa-ci-internal.sh /vespa-ci-internal.sh +COPY ci/vespa-ci-internal.sh /vespa-ci-internal.sh diff --git a/docker/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index c1102476904..c1102476904 100755 --- a/docker/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.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 |