diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-06-20 17:29:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 17:29:34 +0200 |
| commit | 800ce4c3006363b3b307c745bee2ce7ee37c2d8b (patch) | |
| tree | f5407c5360147e820cdcb0a45d415921469936c7 /docker/Dockerfile.run | |
| parent | 8b2657c5aac077f2e64e76d5af840307c37b38fa (diff) | |
| parent | 8f1bb3bd3300bdc1b1d379dc414275fc834ac2fc (diff) | |
Merge pull request #2845 from yahoo/geirst/separate-script-for-docker-image-building
Move building of docker image to separate script and tag it with vers…
Diffstat (limited to 'docker/Dockerfile.run')
| -rw-r--r-- | docker/Dockerfile.run | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run index 19d0fd345c3..4116b12a00d 100644 --- a/docker/Dockerfile.run +++ b/docker/Dockerfile.run @@ -1,11 +1,15 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. FROM centos:7 +ARG VESPA_VERSION # Needed to run 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 +COPY vespa*-${VESPA_VERSION}-*.rpm /tmp/ +RUN yum localinstall -y $(ls /tmp/vespa*-${VESPA_VERSION}-*.rpm | xargs) + ENV VESPA_HOME=/opt/vespa ENV PATH="${PATH}:${VESPA_HOME}/bin" |