[ARVADOS] updated: 2.3.2-66-gbdac83b28

[Git user]

Summary of changes:
 build/package-build-dockerfiles/centos7/Dockerfile    | 2 --
 build/package-build-dockerfiles/debian10/Dockerfile   | 2 --
 build/package-build-dockerfiles/debian11/Dockerfile   | 2 --
 build/package-build-dockerfiles/ubuntu1804/Dockerfile | 2 --
 build/package-build-dockerfiles/ubuntu2004/Dockerfile | 2 --
 5 files changed, 10 deletions(-)

       via  bdac83b2871315e550aa73a8ffe065e01e932350 (commit)
      from  89d70b36fb00c3650dac36a3f72d8c59a21cbaf3 (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 bdac83b2871315e550aa73a8ffe065e01e932350
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Mar 9 09:01:06 2022 -0500

    Remove the pre-seeding of gems needed by arvados-api-server and
    arvados-workbench from the package build Dockerfiles.
    
    This step was doing a git clone from main. This can cause issues when
    the packages being built are for another branch. For example, when the
    Gemfile in main has gems with a dependency on a version of Ruby that is
    newer than the one installed in these Dockerfiles on the branch being
    built, which is what happened today.
    
    The git clone should really be for the commit being built, but that
    would make the image specific to that build, which means we might as
    well not pre-seed.
    
    The pre-seeding of these gems was of dubious utility anyway, since we
    rebuild the package build images on every package build step invocation
    on the CI server.
    
    refs #18766
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index edfe3405f..397b777d2 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -45,8 +45,6 @@ RUN touch /var/lib/rpm/* && yum -q -y install python3 python3-pip python3-devel
 # Install virtualenv
 RUN /usr/bin/pip3 install 'virtualenv<20'
 
-RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
-
 # The version of setuptools that comes with CentOS is way too old
 RUN pip3 install 'setuptools<45'
 
diff --git a/build/package-build-dockerfiles/debian10/Dockerfile b/build/package-build-dockerfiles/debian10/Dockerfile
index 809d93588..b9bf002c7 100644
--- a/build/package-build-dockerfiles/debian10/Dockerfile
+++ b/build/package-build-dockerfiles/debian10/Dockerfile
@@ -33,7 +33,5 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/
 RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/
 
-RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
-
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian10"]
diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index 06380ef89..d3a625fc5 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -34,7 +34,5 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/
 RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/
 
-RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
-
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian11"]
diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index 4a210373f..9545e6193 100644
--- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@ -32,7 +32,5 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/
 RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/
 
-RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
-
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1804"]
diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
index 276b29fc5..b7bcff553 100644
--- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
@@ -32,7 +32,5 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/
 RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/
 
-RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
-
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu2004"]

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


hooks/post-receive
--