Merge branch 'master' into enhancement/49-tls-encryption

autopilotpattern · Jan 8, 2018 · 5209fd7 · 5209fd7
2 parents 145e368 + e4f9031
commit 5209fd7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/bin/consul-manage b/bin/consul-manage
@@ -63,7 +63,6 @@ preStart() {
     # advertise_addr_wan tells nodes their public address for WAN communication
     updateConfigFromEnvOrDefault 'advertise_addr_wan'   'CONSUL_ADVERTISE_ADDR_WAN' "$IP_ADDRESS"
 
-
     # there's no consul env for this
     if [ -n "$CONSUL_ENCRYPT" ]; then
         sed -i '/^encrypt =/d' /etc/consul/consul.hcl
@@ -237,10 +236,6 @@ _log() {
     echo "    $(date -u '+%Y-%m-%d %H:%M:%S') containerpilot: $@"
 }
 
-_exitSuccess() {
-    exit 0
-}
-
 #
 # Defines $1 in the consul configuration as either an env or a default.
 # This basically behaves like ${!name_of_var} and ${var:-default} together

diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
@@ -9,7 +9,6 @@ services:
   # env var) to find each other and bootstrap the cluster.
   # Note: Unless CONSUL_DEV is set, at least three instances are required for quorum.
   consul:
-    build: ../../
     image: autopilotpattern/consul:${TAG:-latest}
     restart: always
     mem_limit: 128m

diff --git a/examples/triton/setup.sh b/examples/triton/setup.sh
@@ -59,8 +59,8 @@ check() {
     local docker_user=$(docker info 2>&1 | awk -F": " '/SDCAccount:/{print $2}')
     local docker_dc=$(echo $DOCKER_HOST | awk -F"/" '{print $3}' | awk -F'.' '{print $1}')
 
-    TRITON_USER=$(triton profile get $TRITON_PROFILE | awk -F": " '/account:/{print $2}')
-    TRITON_DC=$(triton profile get $TRITON_PROFILE | awk -F"/" '/url:/{print $3}' | awk -F'.' '{print $1}')
+    TRITON_USER=$(triton profile get | awk -F": " '/account:/{print $2}')
+    TRITON_DC=$(triton profile get | awk -F"/" '/url:/{print $3}' | awk -F'.' '{print $1}')
     TRITON_ACCOUNT=$(triton account get | awk -F": " '/id:/{print $2}')
 
     if [ ! "$docker_user" = "$TRITON_USER" ] || [ ! "$docker_dc" = "$TRITON_DC" ]; then