alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add : as it removes need for if. : makes it use if var is empty or unset not just unset

Browse Source
This commit is contained in:
James
2017-06-14 12:43:00 -07:00
parent 1d8d24b9af
commit 7bfc233fc5
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test.sh
View File

@@ -9,7 +9,7 @@ docker run --name func-mysql-test -p 3307:3306 -e MYSQL_DATABASE=funcs -e MYSQL_
docker rm -fv func-redis-test|| echo No prev redis test db container docker rm -fv func-redis-test|| echo No prev redis test db container
docker run --name func-redis-test -p 6301:6379 -d redis docker run --name func-redis-test -p 6301:6379 -d redis
sleep 5 sleep 5
case ${DOCKER_LOCATION-localhost} in case ${DOCKER_LOCATION:-localhost} in
localhost) localhost)
export POSTGRES_HOST=localhost export POSTGRES_HOST=localhost
export POSTGRES_PORT=15432 export POSTGRES_PORT=15432
@@ -24,18 +24,14 @@ docker_ip)
if [[ ! -z ${DOCKER_HOST} ]] if [[ ! -z ${DOCKER_HOST} ]]
then then
DOCKER_IP=`echo ${DOCKER_HOST} | awk -F/ '{print $3}'` DOCKER_IP=`echo ${DOCKER_HOST} | awk -F/ '{print $3}'`
if [[ -z ${DOCKER_IP} ]]
then
DOCKER_IP=localhost
fi
fi fi
export POSTGRES_HOST=${DOCKER_IP-localhost} export POSTGRES_HOST=${DOCKER_IP:-localhost}
export POSTGRES_PORT=15432 export POSTGRES_PORT=15432
export MYSQL_HOST=${DOCKER_IP-localhost} export MYSQL_HOST=${DOCKER_IP:-localhost}
export MYSQL_PORT=3307 export MYSQL_PORT=3307
export REDIS_HOST=${DOCKER_IP-localhost} export REDIS_HOST=${DOCKER_IP:-localhost}
export REDIS_PORT=6301 export REDIS_PORT=6301
;; ;;
container_ip) container_ip)