[ARVADOS] updated: 1.1.0-189-gd7c1ea6

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base               | 2 +-
 tools/arvbox/lib/arvbox/docker/Dockerfile.demo               | 5 ++++-
 tools/arvbox/lib/arvbox/docker/service/sso/run-service       | 1 +
 tools/arvbox/lib/arvbox/docker/service/workbench/run         | 6 ++++++
 tools/arvbox/lib/arvbox/docker/service/workbench/run-service | 3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)

       via  d7c1ea62974317c40a66f5cc3c1797dcba30289f (commit)
      from  0d06a2984420d9d48e16ccb6d85982b3dce05644 (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 d7c1ea62974317c40a66f5cc3c1797dcba30289f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Nov 27 11:18:11 2017 -0500

    Fix arvbox localdemo problems. refs #12660
    
    * Checkout composer when building demo image.
    * Fix node.js version.
    * Precompile assests for SSO and workbench.
    * Set correct workbench rails environment.
    
    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 cf46087..f29066e 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -77,7 +77,7 @@ RUN set -e && \
 
 RUN pip install -U setuptools
 
-ENV NODEVERSION v6.11.2
+ENV NODEVERSION v6.11.4
 
 # Install nodejs binary
 RUN curl -L -f https://nodejs.org/dist/${NODEVERSION}/node-${NODEVERSION}-linux-x64.tar.xz | tar -C /usr/local -xJf - && \
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index 39bc21c..80344c1 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -5,12 +5,15 @@
 FROM arvados/arvbox-base
 ARG arvados_version
 ARG sso_version=master
+ARG composer_version=master
 
 RUN cd /usr/src && \
     git clone --no-checkout https://github.com/curoverse/arvados.git && \
     git -C arvados checkout ${arvados_version} && \
     git clone --no-checkout https://github.com/curoverse/sso-devise-omniauth-provider.git sso && \
-    git -C sso checkout ${sso_version}
+    git -C sso checkout ${sso_version} && \
+    git clone --no-checkout https://github.com/curoverse/composer.git && \
+    git -C composer checkout ${composer_version}
 
 ADD service/ /var/lib/arvbox/service
 RUN ln -sf /var/lib/arvbox/service /etc
diff --git a/tools/arvbox/lib/arvbox/docker/service/sso/run-service b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
index 1dfffaf..ab20d57 100755
--- a/tools/arvbox/lib/arvbox/docker/service/sso/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
@@ -83,6 +83,7 @@ fi
 rm -rf tmp
 mkdir -p tmp/cache
 
+bundle exec rake assets:precompile
 bundle exec rake db:migrate
 
 set +u
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run b/tools/arvbox/lib/arvbox/docker/service/workbench/run
index 1bd89f9..a41922b 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run
@@ -13,6 +13,12 @@ rm -rf tmp
 mkdir tmp
 chown arvbox:arvbox tmp
 
+if test -s /var/lib/arvados/workbench_rails_env ; then
+  export RAILS_ENV=$(cat /var/lib/arvados/workbench_rails_env)
+else
+  export RAILS_ENV=development
+fi
+
 if test "$1" != "--only-deps" ; then
     exec bundle exec passenger start --port 80 \
          --user arvbox --runtime-dir=/var/lib/passenger
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 8382a1c..885385a 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -45,6 +45,9 @@ $RAILS_ENV:
   keep_web_download_url: http://$localip:${services[keep-web]}/c=%{uuid_or_pdh}
   keep_web_url: http://$localip:${services[keep-web]}/c=%{uuid_or_pdh}
   arvados_docsite: http://$localip:${services[doc]}/
+  force_ssl: false
 EOF
 
+bundle exec rake assets:precompile
+
 (cd config && /usr/local/lib/arvbox/application_yml_override.py)

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


hooks/post-receive
--