Skip to content

Commit 3a197ca

Browse files
committed
Use more standard shell var naming conventions
1 parent 9609830 commit 3a197ca

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

run.sh

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22

33
cyan='\033[0;36m'
44
blue='\033[0;34m'
5-
NC='\033[0m' # No Color
5+
no_color='\033[0m' # No Color
66

7-
echo "${cyan}Stopping the backend container and removing its image...${NC}"
7+
echo "${cyan}Stopping the backend container and removing its image...${no_color}"
88
docker rm -f backend &>/dev/null
99
docker rmi -f backend-image &>/dev/null
10-
echo "${cyan}Building a new backend image...${NC}"
10+
echo "${cyan}Building a new backend image...${no_color}"
1111
docker build -t="backend-image" --force-rm hosts/backend
12-
echo "${cyan}Starting a new backend image...${NC}"
12+
echo "${cyan}Starting a new backend image...${no_color}"
1313
docker run --name backend -d backend-image
1414

15-
echo "${cyan}Fetching Lua depedencies...${NC}"
15+
echo "${cyan}Fetching Lua depedencies...${no_color}"
1616
function load_dependency {
17-
local TARGET="$1"
18-
local USER="$2"
19-
local REPO="$3"
20-
local COMMIT="$4"
17+
local target="$1"
18+
local user="$2"
19+
local repo="$3"
20+
local commit="$4"
2121

22-
if [ -e "$TARGET" ]; then
23-
echo "Dependency $TARGET already downloaded."
22+
if [ -e "$target" ]; then
23+
echo "Dependency $target already downloaded."
2424
else
25-
curl https://codeload.github.com/$USER/$REPO/tar.gz/$COMMIT | tar -xz --strip 1 $REPO-$COMMIT/lib
25+
curl https://codeload.github.com/$user/$repo/tar.gz/$commit | tar -xz --strip 1 $repo-$commit/lib
2626
fi
2727
}
2828

@@ -32,36 +32,36 @@ load_dependency "lib/basexx.lua" "aiq" "basexx" "c91cf5438385d9f84f53d3ef27f855c
3232

3333
# build proxy containers and images
3434

35-
for PROXY_DIR in hosts/proxy/*; do
36-
[ -d "${PROXY_DIR}" ] || continue # if not a directory, skip
35+
for proxy_dir in hosts/proxy/*; do
36+
[ -d "${proxy_dir}" ] || continue # if not a directory, skip
3737

38-
PROXY_NAME="$(basename $PROXY_DIR)"
39-
echo "${cyan}Building container and image for the '$PROXY_NAME' proxy (Nginx) host...${NC}"
38+
proxy_name="$(basename $proxy_dir)"
39+
echo "${cyan}Building container and image for the '$proxy_name' proxy (Nginx) host...${no_color}"
4040

41-
echo "${blue}Deploying Lua scripts and depedencies${NC}"
42-
rm -rf hosts/proxy/$PROXY_NAME/nginx/lua
43-
mkdir -p hosts/proxy/$PROXY_NAME/nginx/lua
44-
cp nginx-jwt.lua hosts/proxy/$PROXY_NAME/nginx/lua
45-
cp -r lib/ hosts/proxy/$PROXY_NAME/nginx/lua
41+
echo "${blue}Deploying Lua scripts and depedencies${no_color}"
42+
rm -rf hosts/proxy/$proxy_name/nginx/lua
43+
mkdir -p hosts/proxy/$proxy_name/nginx/lua
44+
cp nginx-jwt.lua hosts/proxy/$proxy_name/nginx/lua
45+
cp -r lib/ hosts/proxy/$proxy_name/nginx/lua
4646

47-
echo "${blue}Stopping the container and removing the image${NC}"
48-
docker rm -f "proxy-$PROXY_NAME" &>/dev/null
49-
docker rmi -f "proxy-$PROXY_NAME-image" &>/dev/null
47+
echo "${blue}Stopping the container and removing the image${no_color}"
48+
docker rm -f "proxy-$proxy_name" &>/dev/null
49+
docker rmi -f "proxy-$proxy_name-image" &>/dev/null
5050

51-
echo "${blue}Building the new image${NC}"
52-
docker build -t="proxy-$PROXY_NAME-image" --force-rm hosts/proxy/$PROXY_NAME
51+
echo "${blue}Building the new image${no_color}"
52+
docker build -t="proxy-$proxy_name-image" --force-rm hosts/proxy/$proxy_name
5353

54-
HOST_PORT="$(cat hosts/proxy/$PROXY_NAME/host_port)"
55-
echo "${blue}Staring new container, binding it to Docker host port $HOST_PORT${NC}"
56-
docker run --name "proxy-$PROXY_NAME" -d -p $HOST_PORT:80 --link backend:backend "proxy-$PROXY_NAME-image"
54+
host_port="$(cat hosts/proxy/$proxy_name/host_port)"
55+
echo "${blue}Staring new container, binding it to Docker host port $host_port${no_color}"
56+
docker run --name "proxy-$proxy_name" -d -p $host_port:80 --link backend:backend "proxy-$proxy_name-image"
5757
done
5858

59-
echo "${cyan}Running integration tests:${NC}"
59+
echo "${cyan}Running integration tests:${no_color}"
6060
cd test
6161
# make sure npm packages are installed
6262
npm install
6363
# run tests
6464
npm test
6565

66-
echo "${cyan}Proxy:${NC}"
66+
echo "${cyan}Proxy:${no_color}"
6767
echo curl http://$(boot2docker ip)

0 commit comments

Comments
 (0)