diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-22 14:05:05 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-22 14:05:05 +0200 |
| commit | 4987a03e3e69e761153dfe552ecadcf21e49b2f0 (patch) | |
| tree | 5a3f86477c2856b568e44d6cea9ea4219dc9637d | |
| parent | 6e89d1bd63edc795fe9d3283e90beb8b676ff90f (diff) | |
Changes needed to get Vespa up and running in Docker.
| -rw-r--r-- | dist/vespa.spec | 4 | ||||
| -rwxr-xr-x | docker/osx-setup-docker-machine.sh | 7 | ||||
| -rwxr-xr-x | docker/run-vespa.sh | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 4a37716759f..04de38731a3 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -120,7 +120,7 @@ mkdir -p %{buildroot}/%{_prefix}/var/spool/master/inbox/ mkdir -p %{buildroot}/%{_prefix}/var/vespa/bundlecache/ mkdir -p %{buildroot}/%{_prefix}/var/vespa/cache/config/ mkdir -p %{buildroot}/%{_prefix}/var/vespa/cmdlines/ -mkdir -p %{buildroot}/%{_prefix}/var/zookeeper/ +mkdir -p %{buildroot}/%{_prefix}/var/zookeeper/version-2/ ln -s %{_prefix}/lib/jars/config-model-fat.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/config-model-fat.jar ln -s %{_prefix}/lib/jars/configserver-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/configserver.jar @@ -185,7 +185,7 @@ exit 0 %dir %attr( 755, vespa, vespa) %{_prefix}/var/vespa/bundlecache/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/vespa/cache/config/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/vespa/cmdlines/ -%dir %attr( 755, vespa, vespa) %{_prefix}/var/zookeeper/ +%dir %attr( 755, vespa, vespa) %{_prefix}/var/zookeeper/version-2/ %{_prefix}/libexec/vespa/vespa-config.pl %{_prefix}/libexec/vespa/common-env.sh diff --git a/docker/osx-setup-docker-machine.sh b/docker/osx-setup-docker-machine.sh index ce27012ab46..f6c9e870cf8 100755 --- a/docker/osx-setup-docker-machine.sh +++ b/docker/osx-setup-docker-machine.sh @@ -38,5 +38,12 @@ if [ "$VESPA_VM_STATUS" != "Running" ]; then exit 1 fi +if $DOCKER_VM_WAS_STARTED; then + # Hostname should match the public IP + docker-machine ssh "$DOCKER_VM_NAME" "sudo sed -i \"s/127.0.0.1 $DOCKER_VM_NAME/127.0.0.1/\" /etc/hosts" + docker-machine ssh "$DOCKER_VM_NAME" "sudo sed -i \"/$DOCKER_VM_NAME/d\" /etc/hosts" + docker-machine ssh "$DOCKER_VM_NAME" "sudo echo $(docker-machine ip $DOCKER_VM_NAME) $DOCKER_VM_NAME | sudo tee -a /etc/hosts" > /dev/null +fi + eval $(docker-machine env "$DOCKER_VM_NAME") diff --git a/docker/run-vespa.sh b/docker/run-vespa.sh index 2ff511cc70b..e11324a7b93 100755 --- a/docker/run-vespa.sh +++ b/docker/run-vespa.sh @@ -13,5 +13,5 @@ VESPA_VERSION=$1 DOCKER_IMAGE=vesparun docker build -t "$DOCKER_IMAGE" -f Dockerfile.run . -docker run -d -v $(pwd)/..:/vespa --entrypoint /vespa/docker/run-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" +docker run -d -v $(pwd)/..:/vespa --net=host --privileged --entrypoint /vespa/docker/run-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" |