Skip to content

new testbed docker image #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
perigee merged 4 commits into from
May 18, 2016
Merged

new testbed docker image #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe27d44
clean new line
perigee May 12, 2016
0f5f14d
try 10 times instead of 8 for local testing
perigee May 16, 2016
0488aec
using latest
perigee May 17, 2016
7113539
Merge branch 'master' into jun_candidate
perigee May 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies:
post:
- npm run cibuild
- docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:latest
- sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cp -f /var/www/streambed/image_server/plotly.js/test/image/index.html /var/www/streambed/image_server/server_app/index.html"
- wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping
test:
override:
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ dev:
- .:/var/www/streambed/image_server/plotly.js
ports:
- "9010:9010"
- "2022:22"
2 changes: 1 addition & 1 deletion tasks/baseline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CMD=(
"cd /var/www/streambed/image_server/plotly.js &&"
"cp -f test/image/index.html ../server_app/index.html &&"
"supervisorctl restart nw1 &&"
"wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&"
"wget --server-response --spider --tries=10 --retry-connrefused http://localhost:9010/ping &&"
"node test/image/make_baseline.js $1"
)

Expand Down
2 changes: 1 addition & 1 deletion tasks/test_export.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CMD=(
"cd /var/www/streambed/image_server/plotly.js &&"
"cp -f test/image/index.html ../server_app/index.html &&"
"supervisorctl restart nw1 && "
"wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&"
"wget --server-response --spider --tries=10 --retry-connrefused http://localhost:9010/ping &&"
"node test/image/export_test.js $1"
)

Expand Down
2 changes: 1 addition & 1 deletion tasks/test_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CMD=(
"cd /var/www/streambed/image_server/plotly.js &&"
"cp -f test/image/index.html ../server_app/index.html &&"
"supervisorctl restart nw1 && "
"wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&"
"wget --server-response --spider --tries=10 --retry-connrefused http://localhost:9010/ping &&"
"node test/image/compare_pixels_test.js $1"
)

Expand Down