[ARVADOS-DEV] updated: 65a3779e6968835bc0b1fc1b103a408fd4eec4aa

[Git user]

Summary of changes:
 jenkins/package-build-dockerfiles/centos6/Dockerfile    | 2 +-
 jenkins/package-build-dockerfiles/debian7/Dockerfile    | 2 +-
 jenkins/package-build-dockerfiles/debian8/Dockerfile    | 2 +-
 jenkins/package-build-dockerfiles/ubuntu1204/Dockerfile | 2 +-
 jenkins/package-build-dockerfiles/ubuntu1404/Dockerfile | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

       via  65a3779e6968835bc0b1fc1b103a408fd4eec4aa (commit)
      from  726ff8da135916c0cd6e3e0e4c9614a91d3ccfca (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 65a3779e6968835bc0b1fc1b103a408fd4eec4aa
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Feb 20 03:39:03 2016 -0500

    Install bundler gem in all build containers.
    
    RVM used to install bundler by default, but now it doesn't.
    
    https://github.com/rvm/rvm/commit/dc07790042d78c525d7d52616c78cb2d55c0e764
    
    I suppose some systems (like Jenkins) have been able to continue
    working because they have cached docker images that were built before
    RVM dropped bundler (1.26.11 -- Mar 30, 2015).
    
    But on a new system, we ended up here:
    
    [...]
    Package python3-websocket-client_0.35.0-1_all.deb exists, not rebuilding
    /jenkins/run-library.sh: line 139: bundle: command not found
    ERROR: arvados-api-server package prep failed
    /jenkins/run-build-packages.sh: line 492: bundle: command not found
    ERROR: Asset precompilation failed
    ERROR:  build failed with exit status 1.
    
    No issue #

diff --git a/jenkins/package-build-dockerfiles/centos6/Dockerfile b/jenkins/package-build-dockerfiles/centos6/Dockerfile
index 2bbec2e..8a9d931 100644
--- a/jenkins/package-build-dockerfiles/centos6/Dockerfile
+++ b/jenkins/package-build-dockerfiles/centos6/Dockerfile
@@ -13,7 +13,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.1 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
-    /usr/local/rvm/bin/rvm-exec default gem install bundle fpm
+    /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
 
 # Need to "touch" RPM database to workaround bug in interaction between
 # overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
diff --git a/jenkins/package-build-dockerfiles/debian7/Dockerfile b/jenkins/package-build-dockerfiles/debian7/Dockerfile
index 21b554f..0d04590 100644
--- a/jenkins/package-build-dockerfiles/debian7/Dockerfile
+++ b/jenkins/package-build-dockerfiles/debian7/Dockerfile
@@ -9,7 +9,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.1 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
-    /usr/local/rvm/bin/rvm-exec default gem install fpm
+    /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
 
 # Install golang binary
 ADD generated/golang-amd64.tar.gz /usr/local/
diff --git a/jenkins/package-build-dockerfiles/debian8/Dockerfile b/jenkins/package-build-dockerfiles/debian8/Dockerfile
index 6fb622a..fcd390f 100644
--- a/jenkins/package-build-dockerfiles/debian8/Dockerfile
+++ b/jenkins/package-build-dockerfiles/debian8/Dockerfile
@@ -9,7 +9,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.1 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
-    /usr/local/rvm/bin/rvm-exec default gem install fpm
+    /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
 
 # Install golang binary
 ADD generated/golang-amd64.tar.gz /usr/local/
diff --git a/jenkins/package-build-dockerfiles/ubuntu1204/Dockerfile b/jenkins/package-build-dockerfiles/ubuntu1204/Dockerfile
index 4984d37..7d480a5 100644
--- a/jenkins/package-build-dockerfiles/ubuntu1204/Dockerfile
+++ b/jenkins/package-build-dockerfiles/ubuntu1204/Dockerfile
@@ -9,7 +9,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.1 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
-    /usr/local/rvm/bin/rvm-exec default gem install fpm
+    /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
 
 # Install golang binary
 ADD generated/golang-amd64.tar.gz /usr/local/
diff --git a/jenkins/package-build-dockerfiles/ubuntu1404/Dockerfile b/jenkins/package-build-dockerfiles/ubuntu1404/Dockerfile
index a3d6c8d..0b8ee7a 100644
--- a/jenkins/package-build-dockerfiles/ubuntu1404/Dockerfile
+++ b/jenkins/package-build-dockerfiles/ubuntu1404/Dockerfile
@@ -9,7 +9,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.1 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
-    /usr/local/rvm/bin/rvm-exec default gem install fpm
+    /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
 
 # Install golang binary
 ADD generated/golang-amd64.tar.gz /usr/local/

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


hooks/post-receive
--