Merge branch 'image-test' of github.com:plotly/plotly.js into image-test

Author: etpinard

circle.yml

@@ -0,0 +1,17 @@
+general:
+  branches:
+    only:
+      - image-test
+
+machine:
+  services:
+    - docker
+
+dependencies:
+  pre: 
+    - docker pull plotly/imageserver:0.2.1
+
+test:
+  override:
+    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:0.2.1; sleep 10
+    - 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"

docker_part_readme.md

@@ -13,16 +13,16 @@ Under your `plotly.js` folder, run
 
 ```bash
 $ docker run -d --name your_container_name \
-      -v $PWD:/var/www/streambed/image_server/plotly.js \
-      -p 9010:9010 -p 2022:22 plotly/imageserver:[version]
+                      -v $PWD:/var/www/streambed/image_server/plotly.js \
+		      -p 9010:9010 -p 2022:22 plotly/imageserver:[version]
 ```
 
 ### Run the test
 
 Under your `plotly.js` folder, run
 
 ```bash
-npm run test-image
+$ docker exec -i your_container_name /bin/bash -c "cd /var/www/streambed/image_server/plotly.js && npm run test-image"
 ``` 
 
 ### SSH into docker
@@ -57,6 +57,7 @@ $ ssh-keygen -f "/home/jh/.ssh/known_hosts" -R [localhost]:2022
 
 to remove host information.
 
+
 ### list all images
 
 ```bash
@@ -80,3 +81,4 @@ docker stop [container hash]
 ```bash
 docker rm [container hash]
 ```
+>>>>>>> d81c60098a8948cf60739b6c0ebe839aa9794152

tasks/test_image.sh

@@ -28,4 +28,4 @@ CMD=(
     "node test/image/compare_pixels_test.js $1"
 )
 
-docker exec -i $CONTAINER_NAME /bin/bash -c "${CMD[*]}"
+#docker exec -i $CONTAINER_NAME /bin/bash -c "${CMD[*]}"