From 728a895c0dcd70a7275b0943eed661942ce76d91 Mon Sep 17 00:00:00 2001 From: Stephen Curran Date: Mon, 6 Aug 2018 17:35:58 -0700 Subject: [PATCH] Update the manage scripts to use platform independent docker host sniffer Signed-off-by: Stephen Curran --- TheOrgBook/docker/manage.sh | 3 ++- permitify/docker/manage | 3 ++- von-network/manage | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TheOrgBook/docker/manage.sh b/TheOrgBook/docker/manage.sh index 00c64fc..dcc392c 100755 --- a/TheOrgBook/docker/manage.sh +++ b/TheOrgBook/docker/manage.sh @@ -1,7 +1,8 @@ #!/bin/bash # My addition; allow Dockerhost to be overridden # (useful when running a Softlayer VM with docker compose for example) -export DOCKERHOST=${DOCKERHOST-$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)} +# export DOCKERHOST=${DOCKERHOST-$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)} +export DOCKERHOST=${APPLICATION_URL-$(docker run --rm --net=host codenvy/che-ip)} export MSYS_NO_PATHCONV=1 set -e diff --git a/permitify/docker/manage b/permitify/docker/manage index 6a44051..85a423d 100755 --- a/permitify/docker/manage +++ b/permitify/docker/manage @@ -1,5 +1,6 @@ #!/bin/bash -export DOCKERHOST=${APPLICATION_URL-$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)} +# export DOCKERHOST=${APPLICATION_URL-$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)} +export DOCKERHOST=${APPLICATION_URL-$(docker run --rm --net=host codenvy/che-ip)} export MSYS_NO_PATHCONV=1 set -e diff --git a/von-network/manage b/von-network/manage index f9fe9a0..2b27bd9 100755 --- a/von-network/manage +++ b/von-network/manage @@ -3,11 +3,10 @@ set -e SCRIPT_HOME="$( cd "$( dirname "$0" )" && pwd )" -export DOCKERHOST=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1) +# export DOCKERHOST=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1) +export DOCKERHOST=${APPLICATION_URL-$(docker run --rm --net=host codenvy/che-ip)} export COMPOSE_PROJECT_NAME="von" -export DOCKERHOST=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1) - cd "$SCRIPT_HOME" case "$1" in