[arvados] updated: 2.6.0-425-g3dd5dc397

git repository hosting git at public.arvados.org
Mon Aug 7 14:21:13 UTC 2023


Summary of changes:
 build/package-build-dockerfiles/rocky8/Dockerfile | 2 +-
 build/package-test-dockerfiles/rocky8/Dockerfile  | 2 +-
 services/api/Gemfile.lock                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  3dd5dc39765ef59d2ea6101b80975133ca628af9 (commit)
      from  49c153fed482e6911333d984ce88bdec1a426396 (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 3dd5dc39765ef59d2ea6101b80975133ca628af9
Author: Tom Clegg <tom at curii.com>
Date:   Mon Aug 7 10:04:38 2023 -0400

    20735: Sync bundler version.
    
    See https://dev.arvados.org/issues/20735#note-6
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/build/package-build-dockerfiles/rocky8/Dockerfile b/build/package-build-dockerfiles/rocky8/Dockerfile
index 217de9140..c410a8b59 100644
--- a/build/package-build-dockerfiles/rocky8/Dockerfile
+++ b/build/package-build-dockerfiles/rocky8/Dockerfile
@@ -73,7 +73,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     /usr/local/rvm/bin/rvm install 2.7 -j $(grep -c processor /proc/cpuinfo) && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.7 && \
     echo "gem: --no-document" >> ~/.gemrc && \
-    /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.3.26 && \
+    /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19 && \
     /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
 
 RUN /usr/local/rvm/bin/rvm-exec default bundle config --global jobs $(let a=$(grep -c processor /proc/cpuinfo )-1; echo $a)
diff --git a/build/package-test-dockerfiles/rocky8/Dockerfile b/build/package-test-dockerfiles/rocky8/Dockerfile
index c8f75ae0e..aba9ae5e9 100644
--- a/build/package-test-dockerfiles/rocky8/Dockerfile
+++ b/build/package-test-dockerfiles/rocky8/Dockerfile
@@ -43,6 +43,6 @@ RUN touch /var/lib/rpm/* && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.7 -j $(grep -c processor /proc/cpuinfo) && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.7 && \
-    /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.3.26
+    /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19
 
 COPY localrepo.repo /etc/yum.repos.d/localrepo.repo
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 30ba7d1c2..2d973fde1 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -264,4 +264,4 @@ DEPENDENCIES
   themes_for_rails!
 
 BUNDLED WITH
-   2.3.26
+   2.2.19

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list