diff options
author | Arnstein Ressem <aressem@gmail.com> | 2016-06-19 20:45:18 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@gmail.com> | 2016-06-19 20:45:18 +0200 |
commit | 69e4d4a0f05ff1ff7e03443934a654a0d4c0ac48 (patch) | |
tree | 806f01e4b65a0bee9387dccda410f9cfaae2dcc8 /docker | |
parent | f19794ac06749e699485ec452c417a4b9aa6f1b2 (diff) |
Added comment and added dot for docker build commands.
Diffstat (limited to 'docker')
-rw-r--r-- | docker/Dockerfile.build | 2 | ||||
-rw-r--r-- | docker/Dockerfile.run | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 0555ec81d50..1ce3156a4bc 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -27,7 +27,7 @@ RUN yum -y install vespa-cppunit-devel # Enable devtoolset-4 by default RUN echo "source /opt/rh/devtoolset-4/enable" > /etc/profile.d/devtoolset-4.sh -# Build : docker build -t vespabuild -f Dockerfile.build +# Build : docker build -t vespabuild -f Dockerfile.build . # Run : docker run -ti --rm -v <path to vespa source>:/vespa -v <path to rpmbuild dir>:/root/rpmbuild vespabuild # Make RPM : cd /vespa # ./dist.sh <vespa version> diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run new file mode 100644 index 00000000000..9d7864633db --- /dev/null +++ b/docker/Dockerfile.run @@ -0,0 +1,30 @@ +FROM centos:7 + +# Needed to build vespa +RUN yum -y install epel-release +RUN yum -y install centos-release-scl +RUN yum -y install Judy +RUN yum -y install cmake3 +RUN yum -y install lz4 +RUN yum -y install zlib +RUN yum -y install libicu +RUN yum -y install llvm +RUN yum -y install java-1.8.0-openjdk +RUN yum -y install openssl +RUN yum -y install perl +RUN yum -y install libatomic + +# Install vespa dependencies +RUN curl -o /etc/yum.repos.d/vespa-deps.repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo +RUN yum -y install vespa-boost +RUN yum -y install vespa-libtorrent +RUN yum -y install vespa-zookeeper-c-client +RUN yum -y install vespa-cppunit # Should not be needed ? + +#RUN yum -y install vespa + +# Build : docker build -t vesparun -f Dockerfile.run . +# 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 +# |