Merge pull request #532 from plotly/jun_candidate

new testbed docker image

Author: perigee

circle.yml

@@ -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:

docker-compose.yml

@@ -18,4 +18,3 @@ dev:
     - .:/var/www/streambed/image_server/plotly.js
   ports:
     - "9010:9010"
-    - "2022:22"

tasks/baseline.sh

@@ -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"
 )
 

tasks/test_export.sh

@@ -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"
 )
 

tasks/test_image.sh

@@ -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"
 )