diff options
| author |   Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2018-03-07 15:19:20 -0800 |
|---|---|---|
| committer | Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2018-03-08 16:58:57 -0800 |
| commit | 086faa54cc995f9850c0946f42a83b58fed02046 (patch) | |
| tree | 52fd5bf5ccab077d7120f15b9aae57a4cdcdf451 /deployment | |
| parent | 5031a4e20a281b7a94f8c3743b1572314c574ec4 (diff) | |
Update some fixes.
Adding some fixes to the docker builds and code.
Change-Id: Ia7446519ad64339eefd79975918b469052a27934
Issue-ID: MUSIC-41
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Diffstat (limited to 'deployment')
| -rwxr-xr-x[-rw-r--r--] | deployment/docker-build.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | deployment/docker-entrypoint.sh | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | deployment/run.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | deployment/setup-dependency.sh | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/deployment/docker-build.sh b/deployment/docker-build.sh index 767554f..767554f 100644..100755 --- a/deployment/docker-build.sh +++ b/deployment/docker-build.sh diff --git a/deployment/docker-entrypoint.sh b/deployment/docker-entrypoint.sh index 9b29e3e..0ec8d0e 100644..100755 --- a/deployment/docker-entrypoint.sh +++ b/deployment/docker-entrypoint.sh @@ -8,8 +8,6 @@ function start_consul_server { # Running consul in server mode since we are doing a single node. If we need to add more, # We need to run multiple consul agents in client mode without providing the -server arguements. - # CHANGE THIS TO SERVER MODE! - # consul agent -dev > /dev/null 2>&1 & consul agent -bootstrap -server -bind=127.0.0.1 -data-dir=/dkv/consul & } @@ -28,6 +26,8 @@ function set_paths { } set_paths -start_consul_server -sleep 5 +if [ "$CONSUL_IP" = "localhost" ]; then + start_consul_server + sleep 5 +fi start_api_server diff --git a/deployment/run.sh b/deployment/run.sh index 1aae1f6..2451ef9 100644..100755 --- a/deployment/run.sh +++ b/deployment/run.sh @@ -1,6 +1,6 @@ #!/bin/bash CONSUL_IP="localhost" -MOUNTPATH="/configs" +MOUNTPATH="/configs/" docker run -e CONSUL_IP=$CONSUL_IP -e MOUNTPATH=$MOUNTPATH -it --name dkv -p 8200:8200 -p 8080:8080 dkv diff --git a/deployment/setup-dependency.sh b/deployment/setup-dependency.sh index fcb2d51..fcb2d51 100644..100755 --- a/deployment/setup-dependency.sh +++ b/deployment/setup-dependency.sh |