[arvados] updated: 2.5.0-211-g907983bca

git repository hosting git at public.arvados.org
Thu Mar 2 05:12:17 UTC 2023


Summary of changes:
 build/package-build-dockerfiles/debian11/Dockerfile | 5 ++---
 build/package-test-dockerfiles/debian11/Dockerfile  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

       via  907983bcaaf9cf2f058d150b2e91dcbfba465074 (commit)
      from  4d2004fc4b35fc7e29073228173bd96d9c88ff95 (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 907983bcaaf9cf2f058d150b2e91dcbfba465074
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Mar 2 00:11:33 2023 -0500

    Add --disable-binary to rvm install for debian 11 for upstream bug
    
    refs #20185
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index 7e3c6ac5f..ddbe1114f 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -48,11 +48,10 @@ RUN /usr/bin/pip3 install 'virtualenv<20'
 # Install RVM
 ADD generated/mpapis.asc /tmp/
 ADD generated/pkuczynski.asc /tmp/
-RUN ln -s /bin/mkdir /usr/bin/mkdir && \
-    gpg --import --no-tty /tmp/mpapis.asc && \
+RUN gpg --import --no-tty /tmp/mpapis.asc && \
     gpg --import --no-tty /tmp/pkuczynski.asc && \
     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 install 2.7 -j $(grep -c processor /proc/cpuinfo) --disable-binary && \
     /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.2.19 && \
diff --git a/build/package-test-dockerfiles/debian11/Dockerfile b/build/package-test-dockerfiles/debian11/Dockerfile
index 8c91ca5c7..a659e105d 100644
--- a/build/package-test-dockerfiles/debian11/Dockerfile
+++ b/build/package-test-dockerfiles/debian11/Dockerfile
@@ -17,7 +17,7 @@ ADD generated/pkuczynski.asc /tmp/
 RUN gpg --import --no-tty /tmp/mpapis.asc && \
     gpg --import --no-tty /tmp/pkuczynski.asc && \
     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 install 2.7 -j $(grep -c processor /proc/cpuinfo) --disable-binary && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.7 && \
     echo "gem: --no-document" >> /etc/gemrc && \
     /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list