Further work on the build/run vespa on docker.

6 files changed, 67 insertions, 1 deletions

diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run
index 3717cf1f86a..57eb747bc5a 100644
--- a/docker/Dockerfile.run
+++ b/docker/Dockerfile.run
@@ -34,7 +34,7 @@ ENV VESPA_HOME /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>
+# Run      : docker run -ti --rm --net=host vesparun <path to service startup script>
 #            Need -v options to map directories used to store data
 #            ONLY MANUAL INSTALL OF VESPA RPM TESTED
 #
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/docker/README.md
diff --git a/docker/build-vespa-internal.sh b/docker/build-vespa-internal.sh
new file mode 100755
index 00000000000..37ba1433e4e
--- /dev/null
+++ b/docker/build-vespa-internal.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 <vespa version>"
+fi
+VESPA_VERSION=$1
+
+cd /vespa
+./dist.sh ${VESPA_VERSION}
+rpmbuild -bb ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec
+cp -a ~/rpmbuild/RPMS/x86_64/*.rpm /vespa/docker
+
diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh
new file mode 100755
index 00000000000..44023aedfbd
--- /dev/null
+++ b/docker/build-vespa.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 <vespa version>"
+fi
+VESPA_VERSION=$1
+
+docker build -t vespabuild -f Dockerfile.build .
+docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build-vespa-internal.sh vespabuild "$VESPA_VERSION"
+
diff --git a/docker/osx-setup-docker-machine.sh b/docker/osx-setup-docker-machine.sh
new file mode 100755
index 00000000000..ce27012ab46
--- /dev/null
+++ b/docker/osx-setup-docker-machine.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
+cd $DIR
+
+DOCKER_VM_NAME=vespa-docker-machine
+DOCKER_VM_DISK_SIZE_IN_MB=40000
+DOCKER_VM_MEMORY_SIZE_IN_MB=4000
+DOCKER_VM_CPU_COUNT=4
+
+DOCKER_VM_WAS_STARTED=false
+
+if ! docker-machine status "$DOCKER_VM_NAME" &> /dev/null; then
+  # Machine does not exist and we have to create and start
+  docker-machine create -d virtualbox \
+              --virtualbox-disk-size "$DOCKER_VM_DISK_SIZE_IN_MB" \
+              --virtualbox-memory "$DOCKER_VM_MEMORY_SIZE_IN_MB" \
+              --virtualbox-cpu-count "$DOCKER_VM_CPU_COUNT" \
+              "$DOCKER_VM_NAME"
+
+  eval $(docker-machine env "$DOCKER_VM_NAME")
+  DOCKER_VM_WAS_STARTED=true
+fi
+
+
+VESPA_VM_STATUS=$(docker-machine status "$DOCKER_VM_NAME")
+if [ "$VESPA_VM_STATUS" = "Stopped" ]; then
+    docker-machine start "$DOCKER_VM_NAME"
+    DOCKER_VM_WAS_STARTED=true
+    VESPA_VM_STATUS=$(docker-machine status "$DOCKER_VM_NAME")
+fi
+
+if [ "$VESPA_VM_STATUS" != "Running" ]; then
+  echo "Unable to get Docker machine $DOCKER_VM_NAME up and running."
+  echo "You can try to manually remove the machine: docker-machine rm -y $DOCKER_VM_NAME "
+  echo "  and then rerun this script."
+  echo "Exiting."
+  exit 1
+fi
+
+eval $(docker-machine env "$DOCKER_VM_NAME")
+
diff --git a/docker/run-vespa.sh b/docker/run-vespa.sh
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/docker/run-vespa.sh