aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahoo-inc.com>2016-06-20 08:42:55 +0200
committerArnstein Ressem <aressem@yahoo-inc.com>2016-06-20 08:42:55 +0200
commit3a4abbb20e8a8c002092570a3c0569475336ecb0 (patch)
tree7d8231a607410d9392b70fab72962017cfc38ca1 /docker
parent69e4d4a0f05ff1ff7e03443934a654a0d4c0ac48 (diff)
Added a way to install vespa in run container.
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.build1
-rw-r--r--docker/Dockerfile.run8
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build
index 1ce3156a4bc..fc0df010548 100644
--- a/docker/Dockerfile.build
+++ b/docker/Dockerfile.build
@@ -5,7 +5,6 @@ RUN yum -y install epel-release
RUN yum -y install centos-release-scl
RUN yum -y install devtoolset-4-gcc-c++
RUN yum -y install devtoolset-4-libatomic-devel
-RUN yum -y install ccache
RUN yum -y install Judy-devel
RUN yum -y install cmake3
RUN yum -y install lz4-devel
diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run
index 9d7864633db..df89196e995 100644
--- a/docker/Dockerfile.run
+++ b/docker/Dockerfile.run
@@ -22,8 +22,16 @@ RUN yum -y install vespa-zookeeper-c-client
RUN yum -y install vespa-cppunit # Should not be needed ?
#RUN yum -y install vespa
+# Workaround while we wait for a published rpm
+COPY <path-to-my-vespa-rpm> /vespa.rpm
+RUN rpm -i vespa.rpm
+
+# Workaround for user name and permissions
+RUN useradd yahoo
+RUN chown -R yahoo:yahoo /opt/vespa
# Build : docker build -t vesparun -f Dockerfile.run .
+# IMORTANT: Need to put the local vespa rpm name in the copy command.
# Run : docker run -ti --rm vesparun <path to service startup script>
# Need -v options to map directories used to store data
# ONLY MANUAL INSTALL OF VESPA RPM TESTED