From 899ed16e550f463e64c355c213bf26023c1cba38 Mon Sep 17 00:00:00 2001
From: Jun HU <junhufr@gmail.com>
Date: Fri, 27 Nov 2015 17:46:28 -0500
Subject: [PATCH 1/4] add compose config file

---
 docker-compose.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000000..92e310ab313
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+---
+# For installing docker-compose, please refer page
+# https://docs.docker.com/compose/install/
+# For using docker compose
+# 1. start docker container, like vagrant, go under folder
+#    contains docker-compose.yml file and run:
+#    $ docker-compose up -d
+# 2. stop the container
+#    $ docker-compose stop
+# 3. remove the container
+#    $ docker-compose rm -f
+
+
+dev:
+  container_name: imageserver
+  image: plotly/imageserver:1.0.0
+  volumes: 
+    - .:/var/www/streambed/image_server/plotly.js
+  ports:
+    - "9010:9010"
+    - "2022:22"
\ No newline at end of file

From 5e3420a3e034baef453d4e043a6f66c5e699b1bc Mon Sep 17 00:00:00 2001
From: Jun HU <junhufr@gmail.com>
Date: Fri, 27 Nov 2015 18:02:38 -0500
Subject: [PATCH 2/4] update document for using docker-compose

---
 docker-compose.yml   |  4 ++--
 test/image/README.md | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 92e310ab313..c65bde79315 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,8 @@
 
 
 dev:
-  container_name: imageserver
-  image: plotly/imageserver:1.0.0
+  container_name: imagetest
+  image: plotly/imageserver:latest
   volumes: 
     - .:/var/www/streambed/image_server/plotly.js
   ports:
diff --git a/test/image/README.md b/test/image/README.md
index 2c4f45d8470..8c0ccd04707 100644
--- a/test/image/README.md
+++ b/test/image/README.md
@@ -2,21 +2,23 @@
 
 Test plotly.js with the Plotly Image-Server docker container.
 
-### Run the container
 
+### Run the container with `docker compose`
+
+Plotly.js uses `docker-compose` to ease the creation/stopping/deletion of testing docker container,
+please refer [installing docker-compose](https://docs.docker.com/compose/install/) for installation.
 Inside your `plotly.js` directory, run
 
 ```bash
-docker run -d --name imagetest \
-    -v $PWD:/var/www/streambed/image_server/plotly.js \
-    -p 9010:9010 -p 2022:22 plotly/imageserver:[version]
+$ docker-compose up -d
 ```
 
-where `[version]` is the latest Plotly Image-Server docker container version
+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
 `imagetest` is the name of the docker container.
 
+
 ### Run the tests
 
 Inside your `plotly.js` directory, run
@@ -70,16 +72,20 @@ docker images
 docker ps -a
 ```
 
-### Stop container
+### Stop your testing container
+
+Inside your `plotly.js` directory, run
 
 ```bash
-docker stop [container_id]
+docker-compose stop
 ```
 
-### Remove container
+### Remove your testing container
+
+Inside your `plotly.js` directory, run
 
 ```bash
-docker rm [container_id]
+docker-compose rm -f
 ```
 
 For more comprehensive information about docker, please refer to [docker document](http://docs.docker.com/)

From 79d79cee2f8c6d7ec90487e091445702ab397641 Mon Sep 17 00:00:00 2001
From: Jun HU <junhufr@gmail.com>
Date: Fri, 27 Nov 2015 18:04:16 -0500
Subject: [PATCH 3/4] update document for using docker-compose

---
 test/image/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/image/README.md b/test/image/README.md
index 8c0ccd04707..a8afc9861cf 100644
--- a/test/image/README.md
+++ b/test/image/README.md
@@ -14,8 +14,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/imageserver/tags/) and
 `imagetest` is the name of the docker container.
 
 

From 5737807234dd424a07c172dd83a5f39d61ece347 Mon Sep 17 00:00:00 2001
From: Jun HU <junhufr@gmail.com>
Date: Fri, 27 Nov 2015 18:13:07 -0500
Subject: [PATCH 4/4] update version to latest

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 9faa311f358..a9a93cf0840 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,10 +12,10 @@ machine:
 
 dependencies:
   pre: 
-    - docker pull plotly/imageserver:1.0.0
+    - docker pull plotly/imageserver:latest
   post:
     - npm run cibuild
-    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:1.0.0; sleep 20
+    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:latest; sleep 20
 
 test:
   override: