Merge branch 'master' of github.com:MG-RAST/AWE

Dockerfile

@@ -2,6 +2,12 @@
 # docker build --force-rm --no-cache --rm -t mgrast/awe .
 # docker tag mgrast/awe mgrast/awe:${TAG}
 
+# skycore push mgrast/awe:${TAG}
+# docker create --name awe-temporary mgrast/awe:${TAG}
+# docker cp awe-temporary:/go/bin/awe-worker .
+# docker cp awe-temporary:/go/bin/awe-submitter .
+# docker rm awe-temporary
+
 
 FROM golang:1.7.6-alpine
 

Dockerfile_worker

@@ -1,7 +1,9 @@
+# AWE worker with CWL runner
+
 # docker build -t mgrast/awe-worker -f Dockerfile_worker .
 
 
-FROM golang:1.7.6-alpine as builder
+FROM golang:1.7.6-alpine
 
 # git needed for GIT_COMMIT_HASH
 RUN apk update && apk add git
@@ -18,15 +20,10 @@ RUN ln -s /go /gopath
 RUN mkdir -p ${AWE} && \
   cd ${AWE} && \
   go get -d ./awe-worker/ && \
-  ./compile.sh
-
-
-
-FROM mgrast/cwl-runner:latest
-
-
-COPY --from=builder /go/bin/awe-worker /
+  ./compile-worker.sh
 
+# install cwl-runner with node.js
+RUN apk update ; apk add py-pip nodejs gcc python-dev musl-dev 
+RUN pip install --upgrade pip ; pip install cwl-runner
 
-ENTRYPOINT ["/awe-worker"]