diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2016-10-07 08:00:34 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahoo-inc.com> | 2016-10-07 08:00:34 +0200 |
| commit | be990f42596e45e3259e57275083a0ce66acb7eb (patch) | |
| tree | 55b3775b3c03cfd98aff1171f2f4cde557b8b584 | |
| parent | 1b331fb8a78d5688dd9157cac1bfbd8a25702868 (diff) | |
Update doc with link to docker dock and set VESPA_HOME where needed
| -rw-r--r-- | node-admin/README.md | 1 | ||||
| -rw-r--r-- | node-admin/README_MAC.md | 2 | ||||
| -rwxr-xr-x | node-admin/scripts/config-server.sh | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/node-admin/README.md b/node-admin/README.md index b727dde7bb8..f4c5f5be4a5 100644 --- a/node-admin/README.md +++ b/node-admin/README.md @@ -8,6 +8,7 @@ You should have the docker daemon running and the following environment variable ``` DOCKER_HOST CONTAINER_CERT_PATH +VESPA_HOME ``` ## Building diff --git a/node-admin/README_MAC.md b/node-admin/README_MAC.md index 71f0cae0d7d..16c1ca46612 100644 --- a/node-admin/README_MAC.md +++ b/node-admin/README_MAC.md @@ -1,5 +1,5 @@ # Setting up Docker on OS X -Install Docker Toolbox according to the procedure on [https://docs.docker.com/mac/step_one](https://docs.docker.com/mac/step_one). +Install Docker according to the procedure on [https://docs.docker.com/docker-for-mac/](https://docs.docker.com/docker-for-mac/). # Running Vespa on OS X diff --git a/node-admin/scripts/config-server.sh b/node-admin/scripts/config-server.sh index f8e0f1a60e4..0806f4374c6 100755 --- a/node-admin/scripts/config-server.sh +++ b/node-admin/scripts/config-server.sh @@ -89,6 +89,7 @@ function Start { --env "HOSTED_VESPA_REGION=$region" \ --env "HOSTED_VESPA_ENVIRONMENT=$environment" \ --env "CONFIG_SERVER_HOSTNAME=$CONFIG_SERVER_HOSTNAME" \ + --env "VESPA_HOME=$VESPA_HOME" \ --env "HOST_BRIDGE_IP=$HOST_BRIDGE_IP" \ --entrypoint /usr/local/bin/start-config-server.sh \ "$DOCKER_IMAGE") |