diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README.md | 2 | ||||
| -rw-r--r-- | docker/run/Dockerfile | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/README.md b/docker/README.md index a89405ad80d..a56af6a7185 100644 --- a/docker/README.md +++ b/docker/README.md @@ -29,8 +29,6 @@ Execute ```./run-vespa.sh <Vespa version number>``` to start Vespa. This starts a Docker container using the Docker image (*vesparun*) from the previous step. Vespa will be started inside the container. -*On OS X, the container runs inside the Docker VM. Execute ```docker-machine ssh vespa-docker-machine``` to enter the VM. The services can also be reached directly from the host on the IP given by ```docker-machine ip vespa-docker-machine```* - ## Building Vespa inside a Docker container Execute ```./enter-build-container.sh``` to enter the Vespa build environment inside a Docker container. diff --git a/docker/run/Dockerfile b/docker/run/Dockerfile index 4116b12a00d..d4b7e489451 100644 --- a/docker/run/Dockerfile +++ b/docker/run/Dockerfile @@ -5,7 +5,8 @@ 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 + yum -y install centos-release-scl && \ + yum -y install maven COPY vespa*-${VESPA_VERSION}-*.rpm /tmp/ RUN yum localinstall -y $(ls /tmp/vespa*-${VESPA_VERSION}-*.rpm | xargs) |