[ARVADOS] updated: 31351d3a55ca31c97a6f098a897a1179caacd701
git at public.curoverse.com
git at public.curoverse.com
Wed Jul 2 11:12:53 EDT 2014
Summary of changes:
docker/bcbio-nextgen/Dockerfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
via 31351d3a55ca31c97a6f098a897a1179caacd701 (commit)
from 945bebae56ec2fb5faef965cbf55fc8309e8df11 (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 31351d3a55ca31c97a6f098a897a1179caacd701
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Jul 2 11:12:50 2014 -0400
Should probably wait to install ruby before setting GEM_HOME and friends.
diff --git a/docker/bcbio-nextgen/Dockerfile b/docker/bcbio-nextgen/Dockerfile
index e3e705b..dfb4ea1 100644
--- a/docker/bcbio-nextgen/Dockerfile
+++ b/docker/bcbio-nextgen/Dockerfile
@@ -3,17 +3,17 @@ MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
USER root
-ADD generated/arvados.tar.gz /usr/src/arvados/
-ENV GEM_HOME /usr/local/rvm/gems/ruby-2.1.0
-ENV GEM_PATH /usr/local/rvm/gems/ruby-2.1.0:/usr/local/rvm/gems/ruby-2.1.0 at global
-ENV PATH /usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0 at global/bin:/usr/local/rvm/rubies/ruby-2.1.0/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
# Install Ruby 2.1.0
RUN apt-get remove --quiet --assume-yes ruby && \
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.1.0 && \
/bin/mkdir -p /usr/src/arvados
+ADD generated/arvados.tar.gz /usr/src/arvados/
+ENV GEM_HOME /usr/local/rvm/gems/ruby-2.1.0
+ENV GEM_PATH /usr/local/rvm/gems/ruby-2.1.0:/usr/local/rvm/gems/ruby-2.1.0 at global
+ENV PATH /usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0 at global/bin:/usr/local/rvm/rubies/ruby-2.1.0/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
# Install dependencies and set up system.
# The FUSE packages help ensure that we can install the Python SDK (arv-mount).
RUN /usr/bin/apt-get update && \
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list