Merge branch 'master' into href-xss

Author: etpinard

circle.yml

@@ -12,12 +12,12 @@ machine:
 
 dependencies:
   pre:
-    - docker pull plotly/imageserver:latest
+    - docker pull plotly/testbed:latest
   post:
     - npm run cibuild
-    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:latest
+    - docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:latest
     - wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping
 test:
   override:
-    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' myimageserver)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/compare_pixels_test.js"
+    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/compare_pixels_test.js"
     - npm run citest-jasmine

docker-compose.yml

@@ -13,7 +13,7 @@
 
 dev:
   container_name: imagetest
-  image: plotly/imageserver:latest
+  image: plotly/testbed:latest
   volumes: 
     - .:/var/www/streambed/image_server/plotly.js
   ports:

test/image/README.md

@@ -35,7 +35,7 @@ docker-compose up -d
 ```
 
 In the `docker-compose.yml` file, `latest` is the latest Plotly Image-Server docker container version
-as listed on [hub.docker.com](https://hub.docker.com/r/plotly/imageserver/tags/) and
+as listed on [hub.docker.com](https://hub.docker.com/r/plotly/testbed/tags/) and
 `imagetest` is the name of the docker container. The `-d` flag tells docker to start the containers in the background and leave them running.
 
 ### Step 2: Run the image tests