fix(*): use host's IP address

deis · Apr 15, 2014 · 36e578d · 36e578d
1 parent 7be28e0
commit 36e578d
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 39 deletions.
diff --git a/builder/bin/boot b/builder/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/builder/systemd/deis-builder.service b/builder/systemd/deis-builder.service
@@ -3,9 +3,9 @@ Description=deis-builder
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/builder:latest
-ExecStartPre=/usr/bin/docker run --name deis-builder-data -v /buildpacks -v /var/lib/docker/graph deis/data
-ExecStart=/usr/bin/docker run --name deis-builder -p 2222:22 -e PUBLISH=22 -e PORT=2222 --volumes-from deis-builder-data --privileged deis/builder
+ExecStartPre=/usr/bin/docker pull deis/builder
+ExecStartPre=/bin/bash -c "/usr/bin/docker start deis-builder-data || /usr/bin/docker run --name deis-builder-data -v /buildpacks -v /var/lib/docker/graph deis/data"
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-builder -p 2222:22 -e PUBLISH=22 -e HOST=$HOST_IP -e PORT=2222 --volumes-from deis-builder-data --privileged deis/builder"
 ExecStop=/usr/bin/docker rm -f deis-builder
 
 [Install]

diff --git a/cache/bin/boot b/cache/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/cache/systemd/deis-cache.service b/cache/systemd/deis-cache.service
@@ -3,8 +3,8 @@ Description=deis-cache
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/cache:latest
-ExecStart=/usr/bin/docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379 deis/cache
+ExecStartPre=/usr/bin/docker pull deis/cache
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379 -e HOST=$HOST_IP deis/cache"
 ExecStop=/usr/bin/docker rm -f deis-cache
 
 [Install]

diff --git a/controller/bin/boot b/controller/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/controller/systemd/deis-controller.service b/controller/systemd/deis-controller.service
@@ -3,8 +3,8 @@ Description=deis-controller
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/controller:latest
-ExecStart=/usr/bin/docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 deis/controller
+ExecStartPre=/usr/bin/docker pull deis/controller
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 -e HOST=$HOST_IP deis/controller"
 ExecStop=/usr/bin/docker rm -f deis-controller
 
 [Install]

diff --git a/database/bin/boot b/database/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/database/systemd/deis-database.service b/database/systemd/deis-database.service
@@ -3,9 +3,9 @@ Description=deis-database
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/database:latest
-ExecStartPre=/usr/bin/docker run --name deis-database-data -v /var/lib/postgresql deis/data
-ExecStart=/usr/bin/docker run --name deis-database -p 5432:5432 -e PUBLISH=5432 --volumes-from deis-database-data deis/database
+ExecStartPre=/usr/bin/docker pull deis/database
+ExecStartPre=/bin/bash -c "/usr/bin/docker start deis-database-data || /usr/bin/docker run --name deis-database-data -v /var/lib/postgresql deis/data"
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-database -p 5432:5432 -e PUBLISH=5432 -e HOST=$HOST_IP --volumes-from deis-database-data deis/database
 ExecStop=/usr/bin/docker rm -f deis-database
 
 [Install]

diff --git a/logger/bin/boot b/logger/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/logger/systemd/deis-logger.service b/logger/systemd/deis-logger.service
@@ -3,9 +3,9 @@ Description=deis-logger
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/logger:latest
-ExecStartPre=/usr/bin/docker run --name deis-logger-data -v /var/log/deis deis/data
-ExecStart=/usr/bin/docker run --name deis-logger -p 514:514 -e PUBLISH=514 --volumes-from deis-logger-data deis/logger
+ExecStartPre=/usr/bin/docker pull deis/logger
+ExecStartPre=/bin/bash -c "/usr/bin/docker start deis-logger-data || /usr/bin/docker run --name deis-logger-data -v /var/log/deis deis/data"
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-logger -p 514:514 -e PUBLISH=514 -e HOST=$HOST_IP --volumes-from deis-logger-data deis/logger"
 ExecStop=/usr/bin/docker rm -f deis-logger
 
 [Install]

diff --git a/registry/bin/boot b/registry/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/registry/systemd/deis-registry.service b/registry/systemd/deis-registry.service
@@ -3,9 +3,9 @@ Description=deis-registry
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/registry:latest
-ExecStartPre=/usr/bin/docker run --name deis-registry-data -v /data deis/data
-ExecStart=/usr/bin/docker run --name deis-registry -p 5000:5000 -e PUBLISH=5000 --volumes-from deis-registry-data deis/registry
+ExecStartPre=/usr/bin/docker pull deis/registry
+ExecStartPre=/bin/bash -c "/usr/bin/docker start deis-registry-data || /usr/bin/docker run --name deis-registry-data -v /data deis/data"
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-registry -p 5000:5000 -e PUBLISH=5000 -e HOST=$HOST_IP --volumes-from deis-registry-data deis/registry"
 ExecStop=/usr/bin/docker rm -f deis-registry
 
 [Install]

diff --git a/router/bin/boot b/router/bin/boot
@@ -9,9 +9,6 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
-# HACK: get the host IP address through the default gateway
-export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
-
 # configure etcd
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"

diff --git a/router/systemd/deis-router.service b/router/systemd/deis-router.service
@@ -3,8 +3,8 @@ Description=deis-router
 
 [Service]
 TimeoutStartSec=20m
-ExecStartPre=/usr/bin/docker pull deis/router:latest
-ExecStart=/usr/bin/docker run --name deis-router -p 80:80 -e PUBLISH=80 deis/router
+ExecStartPre=/usr/bin/docker pull deis/router
+ExecStart=/bin/sh -c "HOST_IP=$(/bin/ifconfig eth0 | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-router -p 80:80 -e PUBLISH=80 -e HOST=$HOST_IP deis/router"
 ExecStop=/usr/bin/docker rm -f deis-router
 
 [Install]