diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-21 14:12:56 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-21 14:12:56 +0200 |
| commit | f9ad45de4028477eac755a5ed2fcc3d14064ba94 (patch) | |
| tree | 3b62c9fc23c49de42d0036224ee04865f427ec3e /docker | |
| parent | 58ff15e924349116d14b630f5f15facf1cfd9a77 (diff) | |
Use vespa-dev image
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build-vespa.sh | 3 | ||||
| -rw-r--r-- | docker/build/Dockerfile | 15 | ||||
| -rwxr-xr-x | docker/enter-build-container.sh | 3 |
3 files changed, 2 insertions, 19 deletions
diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh index 37465ecb503..294d62adf44 100755 --- a/docker/build-vespa.sh +++ b/docker/build-vespa.sh @@ -11,8 +11,7 @@ DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) cd $DIR VESPA_VERSION=$1 -DOCKER_IMAGE="vespabuild" +DOCKER_IMAGE="vespaengine/vespa-dev:latest" -docker build -t "$DOCKER_IMAGE" -f build/Dockerfile . docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build/build-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" "$(id -u)" "$(id -g)" diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile deleted file mode 100644 index ad989969bc5..00000000000 --- a/docker/build/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 centos:7 - -# Needed to build vespa -RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo && \ - yum -y install epel-release && \ - yum -y install centos-release-scl && \ - yum -y install git \ - ccache \ - rpm-build \ - valgrind \ - sudo && \ - echo "source /opt/rh/devtoolset-6/enable" > /etc/profile.d/devtoolset-6.sh && \ - echo "* soft nproc 32768" > /etc/security/limits.d/90-nproc.conf - diff --git a/docker/enter-build-container.sh b/docker/enter-build-container.sh index fd433bc19c3..d540e71f70f 100755 --- a/docker/enter-build-container.sh +++ b/docker/enter-build-container.sh @@ -10,8 +10,7 @@ fi DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) cd $DIR -DOCKER_IMAGE="vespabuild" +DOCKER_IMAGE="vespaengine/vespa-dev:latest" -docker build -t "$DOCKER_IMAGE" -f build/Dockerfile . docker run -ti --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build/enter-build-container-internal.sh "$DOCKER_IMAGE" |