diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-24 12:46:26 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-24 13:58:03 +0200 |
| commit | b2899a0bccee42955491bddc63a7fade386219f4 (patch) | |
| tree | eabd6b9c680445394ebcb2bd66c9c6cd4314447a /docker | |
| parent | da67accbf615ad94e2ff24b061798cdfcc4afec2 (diff) | |
Use new vespa-dev image from Docker Cloud
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ci/Dockerfile | 15 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 12 |
2 files changed, 2 insertions, 25 deletions
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile deleted file mode 100644 index fc2e3ffe666..00000000000 --- a/docker/ci/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -FROM vespabuild - -COPY tmp/vespa.spec /vespa.spec -RUN yum-builddep -y /vespa.spec - -# Build using non-root user 'vespabuilder' -RUN useradd --create-home -s /bin/bash vespabuilder -WORKDIR /home/vespabuilder -USER vespabuilder - -# Java requires proper locale for unicode -ENV LANG en_US.UTF-8 - -COPY ci/vespa-ci-internal.sh /vespa-ci-internal.sh diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index c22c7c0cf7a..ff7af52d820 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -13,17 +13,9 @@ DIR=$(cd "${RELATIVE_DIR}" && pwd) cd $DIR GIT_COMMIT=$1 -BUILD_DOCKER_IMAGE="vespabuild" -CI_DOCKER_IMAGE="vespaci" +DOCKER_IMAGE="vespaengine/vespa-dev:latest" -docker build -t "$BUILD_DOCKER_IMAGE" -f build/Dockerfile . - -# Create a temporary copy of the rpm spec file inside docker directory so it can be referenced by the Dockerfile -rm -rf tmp; mkdir tmp -cp -p ../dist/vespa.spec tmp/vespa.spec - -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" \ +docker run --rm -v ${DIR}/..:/vespa --entrypoint /vespa/docker/ci/vespa-ci-internal.sh "$DOCKER_IMAGE" "$GIT_COMMIT" \ 2>&1 | tee vespa-ci-$(date +%Y-%m-%dT%H:%M:%S%z).log # Needed because of piping docker run to tee above |