From e18269c9944f69f0daf68ad09876abf1d45b731f Mon Sep 17 00:00:00 2001
From: Tomoya Tanjo <ttanjo@gmail.com>
Date: Tue, 20 Feb 2018 17:44:24 +0900
Subject: [PATCH 1/2] Fix an example of Section7 not to use side effect

---
 _episodes/07-containers.md             | 18 ++++++++++++++----
 _includes/cwl/07-containers/docker.cwl |  5 ++++-
 _includes/cwl/conformance-test.yml     | 12 +++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/_episodes/07-containers.md b/_episodes/07-containers.md
index 196a6ea3..3344f99b 100644
--- a/_episodes/07-containers.md
+++ b/_episodes/07-containers.md
@@ -53,7 +53,7 @@ $ cwl-runner docker.cwl docker-job.yml
     -i \
     --volume=/tmp/tmpgugLND:/var/spool/cwl:rw \
     --volume=/tmp/tmpSs5JoN:/tmp:rw \
-    --volume=/home/me/cwl/user_guide/hello.js:/var/lib/cwl/stg16848d97-e6ba-4b35-b666-4546d9965a2d/hello.js:ro \
+    --volume=/home/me/cwl/user_guide/hello.js:/var/lib/cwl/job369354770_examples/hello.js:ro \
     --workdir=/var/spool/cwl \
     --read-only=true \
     --user=1000 \
@@ -62,11 +62,21 @@ $ cwl-runner docker.cwl docker-job.yml
     --env=HOME=/var/spool/cwl \
     node:slim \
     node \
-    /var/lib/cwl/stg16848d97-e6ba-4b35-b666-4546d9965a2d/hello.js
-Hello World
+    /var/lib/cwl/job369354770_examples/hello.js > /tmp/tmpgugLND/output.txt
 [job docker.cwl] completed success
-{}
+{
+    "output": {
+        "location": "file:///home/me/cwl/user_guide/output.txt",
+        "basename": "output.txt",
+        "class": "File",
+        "checksum": "sha1$648a6a6ffffdaa0badb23b8baf90b6168dd16b3a",
+        "size": 12,
+        "path": "/home/me/cwl/user_guide/output.txt"
+    }
+}
 Final process status is success
+$ cat output.txt
+Hello World
 ~~~
 {: .output}
 
diff --git a/_includes/cwl/07-containers/docker.cwl b/_includes/cwl/07-containers/docker.cwl
index f075d497..dde63488 100644
--- a/_includes/cwl/07-containers/docker.cwl
+++ b/_includes/cwl/07-containers/docker.cwl
@@ -11,4 +11,7 @@ inputs:
     type: File
     inputBinding:
       position: 1
-outputs: []
+outputs:
+  output:
+    type: stdout
+stdout: output.txt
diff --git a/_includes/cwl/conformance-test.yml b/_includes/cwl/conformance-test.yml
index 95114735..2b440788 100644
--- a/_includes/cwl/conformance-test.yml
+++ b/_includes/cwl/conformance-test.yml
@@ -48,7 +48,17 @@
       location: Any
       size: 0
 
-# Section 7 depends on side-effects
+# Section 7
+- doc: Test for section 7
+  job: 07-containers/docker-job.yml
+  tool: 07-containers/docker.cwl
+  output:
+    output:
+      class: File
+      checksum: sha1$648a6a6ffffdaa0badb23b8baf90b6168dd16b3a
+      basename: output.txt
+      location: Any
+      size: 12
 
 # Section 8
 - doc: Test for section 8

From 4b156f48b0cdc753cd638fcd19736598a2e232c9 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com>
Date: Tue, 20 Feb 2018 11:27:48 +0200
Subject: [PATCH 2/2] Use released versions of cwltool, cwltest

Add html5lib for schema.org annotations
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60b211ad..22342316 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,7 @@ branches:
     - /.*/
 
 before_script:
-  - git clone https://github.com/common-workflow-language/cwltool.git cwltool && pip install ./cwltool
-  - git clone https://github.com/common-workflow-language/cwltest.git cwltest && pip install ./cwltest
+  - pip install cwltool cwltest html5lib
 
 script:
   - make RUNNER=cwltool unittest-examples