Skip to content

Commit

Permalink
fixed problem caused by replacement marks
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkhy
thinkhy committed Jul 25, 2017
1 parent 3ffc6c8 commit 54e5261
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 18 deletions.
47 changes: 33 additions & 14 deletions deploy_stf.sh
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
NETNAME=""
NETWORK_INTERFACES=$(ls /sys/class/net)

DNS_ADDRESS=$(nmcli device show ${NETNAME}|grep "IP4\.DNS\[1\]"|awk '{print $2}')
echo "DNS Address: ${DNS_ADDRESS}"

# Get exported IP Adreess
[ ! -z "$(echo ${NETWORK_INTERFACES} | grep "wlo1")" ]&&NETNAME="wlo1"
[ ! -z "$(echo ${NETWORK_INTERFACES} | grep "eno1")" ]&&NETNAME="eno1"
IP_ADDRESS=$(ifconfig ${NETNAME}|grep "inet "|awk -F: '{print $2}'|awk '{print $1}')
[ $# -gt 0 ]&&IP_ADDRESS=$1

echo "IP ADDRESS: ${IP_ADDRESS}"

check_return_code() {
if [ $? -ne 0 ]; then
Expand Down Expand Up @@ -57,8 +60,8 @@ prepare() {
docker pull openstf/stf
assert_run_ok

docker pull sorccu/adb
assert_run_ok
#docker pull sorccu/adb
#assert_run_ok

docker pull rethinkdb
assert_run_ok
Expand All @@ -73,6 +76,7 @@ prepare() {
assert_run_ok

sed -e "s/__IP_ADDRESS__/${IP_ADDRESS}/g" \
-e "s/__DNS_ADDRESS__/${DNS_ADDRESS}/g" \
nginx.conf.template |tee nginx.conf
echo 1>"env.ok"

Expand All @@ -88,75 +92,90 @@ systemctl start adbd

# start rethinkdb
echo "start docker container: rethinkdb"
docker rm -f rethinkdb
docker run -d --name rethinkdb -v /srv/rethinkdb:/data --net host rethinkdb rethinkdb --bind all --cache-size 8192 --http-port 8090
check_return_code

# start nginx, note: generate nginx.conf first
echo "start docker container: nginx"
docker rm -f nginx
docker run -d -v $(pwd)/nginx.conf:/etc/nginx/nginx.conf:ro --name nginx --net host nginx nginx
check_return_code

# create tables
echo "start docker container: stf-migrate"
docker rm -f stf-migrate
docker run -d --name stf-migrate --net host openstf/stf stf migrate
check_return_code

# create storage components
echo "start docker container: storage-plugin-apk-3300"
docker run -d --name storage-plugin-apk-3300 -p 3300:3000 --dns __DNS_ADDRESS__ openstf/stf stf storage-plugin-apk --port 3000 --storage-url http://__IP_ADDRESS__/
docker rm -f storage-plugin-apk-3300
docker run -d --name storage-plugin-apk-3300 -p 3300:3000 --dns ${DNS_ADDRESS} openstf/stf stf storage-plugin-apk --port 3000 --storage-url http://${IP_ADDRESS}/
check_return_code

echo "start docker container: storage-plugin-image-3400"
docker run -d --name storage-plugin-image-3400 -p 3400:3000 --dns __DNS_ADDRESS__ openstf/stf stf storage-plugin-image --port 3000 --storage-url http://__IP_ADDRESS__/
docker rm -f storage-plugin-image-3400
docker run -d --name storage-plugin-image-3400 -p 3400:3000 --dns ${DNS_ADDRESS} openstf/stf stf storage-plugin-image --port 3000 --storage-url http://${IP_ADDRESS}/
check_return_code

echo "start docker container: storage-temp-3500"
docker run -d --name storage-temp-3500 -v /mnt/storage:/data -p 3500:3000 --dns __DNS_ADDRESS__ openstf/stf stf storage-temp --port 3000 --save-dir /data
docker rm -f storage-temp-3500
docker run -d --name storage-temp-3500 -v /mnt/storage:/data -p 3500:3000 --dns ${DNS_ADDRESS} openstf/stf stf storage-temp --port 3000 --save-dir /data
check_return_code

# tri-proxy
echo "start docker container: triproxy-app"
docker rm -f triproxy-app
docker run -d --name triproxy-app --net host openstf/stf stf triproxy app --bind-pub "tcp://*:7150" --bind-dealer "tcp://*:7160" --bind-pull "tcp://*:7170"
check_return_code

echo "start docker container: triproxy-dev"
docker rm -f triproxy-dev
docker run -d --name triproxy-dev --net host openstf/stf stf triproxy dev --bind-pub "tcp://*:7250" --bind-dealer "tcp://*:7260" --bind-pull "tcp://*:7270"
check_return_code

# auth
echo "start docker container: stf-auth-3200"
docker run -d --name stf-auth-3200 -e "SECRET=YOUR_SESSION_SECRET_HERE" -p 3200:3000 --dns __DNS_ADDRESS__ openstf/stf stf auth-mock --port 3000 --app-url http://__IP_ADDRESS__/
docker rm -f stf-auth-3200
docker run -d --name stf-auth-3200 -e "SECRET=YOUR_SESSION_SECRET_HERE" -p 3200:3000 --dns ${DNS_ADDRESS} openstf/stf stf auth-mock --port 3000 --app-url http://${IP_ADDRESS}/
check_return_code

# api
echo "start docker container: stf-api"
docker run -d --name stf-api --net host -e "SECRET=YOUR_SESSION_SECRET_HERE" openstf/stf stf api --port 3700 --connect-sub tcp://__IP_ADDRESS__:7150 --connect-push tcp://__IP_ADDRESS__:7170
docker rm -f stf-api
docker run -d --name stf-api --net host -e "SECRET=YOUR_SESSION_SECRET_HERE" openstf/stf stf api --port 3700 --connect-sub tcp://${IP_ADDRESS}:7150 --connect-push tcp://${IP_ADDRESS}:7170
check_return_code

# stf APP
echo "start docker container: stf-app-3100"
docker run -d --name stf-app-3100 --net host -e "SECRET=YOUR_SESSION_SECRET_HERE" -p 3100:3000 openstf/stf stf app --port 3100 --auth-url http://__IP_ADDRESS__/auth/mock/ --websocket-url http://__IP_ADDRESS__/
docker rm -f stf-app-3100
docker run -d --name stf-app-3100 --net host -e "SECRET=YOUR_SESSION_SECRET_HERE" -p 3100:3000 openstf/stf stf app --port 3100 --auth-url http://${IP_ADDRESS}/auth/mock/ --websocket-url http://${IP_ADDRESS}/
check_return_code


# processor
echo "start docker container: stf-processor"
docker run -d --name stf-processor --net host openstf/stf stf processor stf-processor.service --connect-app-dealer tcp://__IP_ADDRESS__:7160 --connect-dev-dealer tcp://__IP_ADDRESS__:7260
docker rm -f stf-processor
docker run -d --name stf-processor --net host openstf/stf stf processor stf-processor.service --connect-app-dealer tcp://${IP_ADDRESS}:7160 --connect-dev-dealer tcp://${IP_ADDRESS}:7260
check_return_code

# websocket
echo "start docker container: websocket"
docker run -d --name websocket -e "SECRET=YOUR_SESSION_SECRET_HERE" --net host openstf/stf stf websocket --port 3600 --storage-url http://__IP_ADDRESS__/ --connect-sub tcp://__IP_ADDRESS__:7150 --connect-push tcp://__IP_ADDRESS__:7170
docker rm -f websocket
docker run -d --name websocket -e "SECRET=YOUR_SESSION_SECRET_HERE" --net host openstf/stf stf websocket --port 3600 --storage-url http://${IP_ADDRESS}/ --connect-sub tcp://${IP_ADDRESS}:7150 --connect-push tcp://${IP_ADDRESS}:7170
check_return_code

# reaper
echo "start docker container: reaper"
docker run -d --name reaper --net host openstf/stf stf reaper dev --connect-push tcp://__IP_ADDRESS__:7270 --connect-sub tcp://__IP_ADDRESS__:7150 --heartbeat-timeout 30000
docker rm -f reaper
docker run -d --name reaper --net host openstf/stf stf reaper dev --connect-push tcp://${IP_ADDRESS}:7270 --connect-sub tcp://${IP_ADDRESS}:7150 --heartbeat-timeout 30000
check_return_code

# provider
echo "start docker container: provider-__HOSTNAME__"
docker run -d --name provider1 --net host openstf/stf stf provider --name "provider-__HOSTNAME__" --connect-sub tcp://__IP_ADDRESS__:7250 --connect-push tcp://__IP_ADDRESS__:7270 --storage-url http://__IP_ADDRESS__ --public-ip __IP_ADDRESS__ --min-port=15000 --max-port=25000 --heartbeat-interval 20000 --screen-ws-url-pattern "ws://__IP_ADDRESS__/d/floor4/<%= serial %>/<%= publicPort %>/"
echo "start docker container: provider-${HOSTNAME}"
docker rm -f provider1
docker run -d --name provider1 --net host openstf/stf stf provider --name "provider-${HOSTNAME}" --connect-sub tcp://${IP_ADDRESS}:7250 --connect-push tcp://${IP_ADDRESS}:7270 --storage-url http://${IP_ADDRESS} --public-ip ${IP_ADDRESS} --min-port=15000 --max-port=25000 --heartbeat-interval 20000 --screen-ws-url-pattern "ws://${IP_ADDRESS}/d/floor4/<%= serial %>/<%= publicPort %>/"
check_return_code


4 changes: 0 additions & 4 deletions nginx.conf.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ http {
proxy_set_header X-Real-IP $http_x_real_ip;
}

location /gripper/ {
proxy_pass http://stf_gripper/gripper/;
}

location /api/ {
proxy_pass http://stf_api/api/;
}
Expand Down

0 comments on commit 54e5261

Please sign in to comment.