using supervisor instead

Author: perigee

circle.yml

@@ -12,10 +12,10 @@ machine:
 
 dependencies:
   pre:
-    - docker pull plotly/imageserver:latest
+    - docker pull plotly/imageserver:candidate
   post:
     - npm run cibuild
-    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:latest; sleep 20
+    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:candidate
 
 test:
   override:

dist/plotly-geo-assets.js

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

docker-compose.yml

@@ -12,8 +12,8 @@ CONTAINER_NAME="imagetest"  # same as in docker-compose.yml
 CMD=(
     "cd /var/www/streambed/image_server/plotly.js &&"
     "cp -f test/image/index.html ../server_app/index.html &&"
-    "monit restart nw1 &&"
-    "sleep 5 &&"
+    "supervisorctl restart nw1 &&"
+    "wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&"
     "node test/image/make_baseline.js $1"
 )
 

tasks/baseline.sh

@@ -12,8 +12,8 @@ CONTAINER_NAME="imagetest"  # same as in docker-compose.yml
 CMD=(
     "cd /var/www/streambed/image_server/plotly.js &&"
     "cp -f test/image/index.html ../server_app/index.html &&"
-    "monit restart nw1 &&"
-    "sleep 5 &&"
+    "supervisorctl restart nw1 && "
+    "wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&"
     "node test/image/compare_pixels_test.js $1"
 )
 

tasks/test_image.sh

@@ -107,6 +107,7 @@ function testMock (fileName, t) {
     }
 
     request(options)
+	.on('response', function() { console.log('pong') })
         .pipe(savedImageStream)
         .on('close', checkImage);
 }