Update Docker-based services to ruby-2.1.0.

diff --git a/docker/api/passenger.conf b/docker/api/passenger.conf
index e031f4f3abefa19ed249ea8b101cb5e7215980a8..b3ad02ac8cd715c8c1acb1f535fd8c3a137cb917 100644 (file)
--- a/docker/api/passenger.conf
+++ b/docker/api/passenger.conf
@@ -1,3 +1,3 @@
-LoadModule passenger_module /usr/local/rvm/gems/ruby-2.0.0-p353/gems/passenger-4.0.23/buildout/apache2/mod_passenger.so
-PassengerRoot /usr/local/rvm/gems/ruby-2.0.0-p353/gems/passenger-4.0.23
-PassengerDefaultRuby /usr/local/rvm/wrappers/ruby-2.0.0-p353/ruby
+LoadModule passenger_module /usr/local/rvm/gems/ruby-2.1.0/gems/passenger-4.0.23/buildout/apache2/mod_passenger.so
+PassengerRoot /usr/local/rvm/gems/ruby-2.1.0/gems/passenger-4.0.23
+PassengerDefaultRuby /usr/local/rvm/wrappers/ruby-2.1.0/ruby

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 66fa89e9c27b3a725c44bc4af60ae156faf0e5bb..de90a0939452b1c8b80babda7bd3d40b85c56a42 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -15,15 +15,15 @@ RUN apt-get update && \
     /bin/mkdir -p /root/.ssh && \
     /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     /usr/sbin/locale-gen && \
-    curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0 && \
+    curl -L https://get.rvm.io | bash -s stable --ruby=2.1.0 && \
     git clone https://github.com/curoverse/arvados.git /usr/src/arvados-upstream
 
 # Set up RVM environment. These are just the env variables created by
 # /usr/local/rvm/scripts/rvm, which can't be run from a non-login shell.
 # TODO(twp): figure out a less awful solution.
-ENV GEM_HOME /usr/local/rvm/gems/ruby-2.0.0-p353
-ENV GEM_PATH /usr/local/rvm/gems/ruby-2.0.0-p353:/usr/local/rvm/gems/ruby-2.0.0-p353@global
-ENV PATH /usr/local/rvm/gems/ruby-2.0.0-p353/bin:/usr/local/rvm/gems/ruby-2.0.0-p353@global/bin:/usr/local/rvm/rubies/ruby-2.0.0-p353/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+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@global
+ENV PATH /usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0@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
 
 # Update gem. This (hopefully) fixes
 # https://github.com/rubygems/rubygems.org/issues/613.

diff --git a/docker/sso/passenger.conf b/docker/sso/passenger.conf
index e031f4f3abefa19ed249ea8b101cb5e7215980a8..b3ad02ac8cd715c8c1acb1f535fd8c3a137cb917 100644 (file)
--- a/docker/sso/passenger.conf
+++ b/docker/sso/passenger.conf
@@ -1,3 +1,3 @@
-LoadModule passenger_module /usr/local/rvm/gems/ruby-2.0.0-p353/gems/passenger-4.0.23/buildout/apache2/mod_passenger.so
-PassengerRoot /usr/local/rvm/gems/ruby-2.0.0-p353/gems/passenger-4.0.23
-PassengerDefaultRuby /usr/local/rvm/wrappers/ruby-2.0.0-p353/ruby
+LoadModule passenger_module /usr/local/rvm/gems/ruby-2.1.0/gems/passenger-4.0.23/buildout/apache2/mod_passenger.so
+PassengerRoot /usr/local/rvm/gems/ruby-2.1.0/gems/passenger-4.0.23
+PassengerDefaultRuby /usr/local/rvm/wrappers/ruby-2.1.0/ruby

diff --git a/docker/workbench/passenger.conf b/docker/workbench/passenger.conf
index e031f4f3abefa19ed249ea8b101cb5e7215980a8..b3ad02ac8cd715c8c1acb1f535fd8c3a137cb917 100644 (file)
--- a/docker/workbench/passenger.conf
+++ b/docker/workbench/passenger.conf
@@ -1,3 +1,3 @@
-LoadModule passenger_module /usr/local/rvm/gems/ruby-2.0.0-p353/gems/passenger-4.0.23/buildout/apache2/mod_passenger.so
-PassengerRoot /usr/local/rvm/gems/ruby-2.0.0-p353/gems/passenger-4.0.23
-PassengerDefaultRuby /usr/local/rvm/wrappers/ruby-2.0.0-p353/ruby
+LoadModule passenger_module /usr/local/rvm/gems/ruby-2.1.0/gems/passenger-4.0.23/buildout/apache2/mod_passenger.so
+PassengerRoot /usr/local/rvm/gems/ruby-2.1.0/gems/passenger-4.0.23
+PassengerDefaultRuby /usr/local/rvm/wrappers/ruby-2.1.0/ruby