[ARVADOS] updated: 78f9bd9ee7166139483991f5e1517fa49f310ac2

Git user git at public.curoverse.com
Mon Aug 14 13:21:07 EDT 2017


Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base             | 14 ++++++++++----
 .../arvbox/lib/arvbox/docker/service/workbench/run-service |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

       via  78f9bd9ee7166139483991f5e1517fa49f310ac2 (commit)
      from  60a39c8be294d58f22c6cb1efe6fc1d850411d60 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 78f9bd9ee7166139483991f5e1517fa49f310ac2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Aug 14 13:17:55 2017 -0400

    arvbox installs nodejs and sets up workbench js assets.  refs #12033
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index b21e49e..db9b648 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -65,14 +65,20 @@ RUN cd /root && \
     GOPATH=$PWD go get github.com/curoverse/runsvinit && \
     install bin/runsvinit /usr/local/bin
 
+ENV PJSVERSION=1.9.7
+
 RUN set -e && \
- PJS=phantomjs-1.9.7-linux-x86_64 && \
- curl -L -o/tmp/$PJS.tar.bz2 http://cache.arvados.org/$PJS.tar.bz2 && \
- tar -C /usr/local -xjf /tmp/$PJS.tar.bz2 && \
- ln -s ../$PJS/bin/phantomjs /usr/local/bin/
+ curl -L -f http://cache.arvados.org/phantomjs-${PJSVERSION}-linux-x86_64.tar.bz2 | tar -C /usr/local -xjf - && \
+ ln -s ../phantomjs-${PJSVERSION}-linux-x86_64/bin/phantomjs /usr/local/bin
 
 RUN pip install -U setuptools
 
+ENV NODEVERSION v6.11.2
+
+# Install nodejs binary
+RUN curl -L -f https://nodejs.org/dist/${NODEVERSION}/node-${NODEVERSION}-linux-x64.tar.xz | tar -C /usr/local -xJf - && \
+    ln -s ../node-${NODEVERSION}-linux-x64/bin/node ../node-${NODEVERSION}-linux-x64/bin/npm /usr/local/bin
+
 ARG arvados_version
 RUN echo arvados_version is git commit $arvados_version
 
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 5c9cd53..d0e855f 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -13,6 +13,7 @@ export RAILS_ENV=development
 
 run_bundler --without=development
 bundle exec passenger start --runtime-check-only --runtime-dir=/var/lib/passenger
+RAILS_GROUPS=assets bundle exec rake npm:install
 
 if test "$1" = "--only-deps" ; then
     exit

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list