find host ip using ifconfig on mac (hyperledger-archives#2914)

Signed-off-by: andrew-coleman <[email protected]>
Ambrosia-labs · Dec 1, 2017 · 02e8cb6 · 02e8cb6
1 parent a7034fb
commit 02e8cb6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/composer-tests-functional/scripts/run-fv-tests.sh b/packages/composer-tests-functional/scripts/run-fv-tests.sh
@@ -80,7 +80,11 @@ for FVTEST in $(echo ${FVTEST} | tr "," " "); do
         cd ../composer-common
         npm publish --registry http://localhost:4873
         cd ../composer-runtime-hlfv1
-        GATEWAY="$(docker inspect hlfv1_default | grep Gateway | cut -d \" -f4)"
+        if [ `uname` = "Darwin" ]; then
+            GATEWAY="$(ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')"
+        else
+            GATEWAY="$(docker inspect hlfv1_default | grep Gateway | cut -d \" -f4)"
+        fi
         echo registry=http://${GATEWAY}:4873 > .npmrc
         cd "${DIR}"
     fi

diff --git a/packages/composer-tests-integration/scripts/run-integration-tests.sh b/packages/composer-tests-integration/scripts/run-integration-tests.sh
@@ -66,7 +66,11 @@ for INTEST in $(echo ${INTEST} | tr "," " "); do
         ARCH=$ARCH docker-compose -f ${DOCKER_FILE} up -d
         cd ${DIR}
         cd ../composer-runtime-hlfv1
-        GATEWAY="$(docker inspect hlfv1_default | grep Gateway | cut -d \" -f4)"
+        if [ `uname` = "Darwin" ]; then
+            GATEWAY="$(ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')"
+        else
+            GATEWAY="$(docker inspect hlfv1_default | grep Gateway | cut -d \" -f4)"
+        fi
         echo registry=http://${GATEWAY}:4873 > .npmrc
     fi