[arvados] updated: 2.7.0-40-gf069c64482

[git repository hosting]

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

       via  f069c64482ba4cac50b950648ee25332060c23fe (commit)
      from  2af7f0d3fe7cb0634e0496e12b8332136cb481ac (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 f069c64482ba4cac50b950648ee25332060c23fe
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 6 17:54:53 2023 -0500

    Fix branch checkout in debian11, refs #21089
    
    Going to test and see if this works, if so it probably needs to be
    applied to all the build Dockerfiles.
    
    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 ddbe1114f3..d7956a66c0 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -9,6 +9,7 @@ ARG GOVERSION
 ## dont use debian:11 here since the word 'bullseye' is used for rvm precompiled binaries
 FROM debian:bullseye as build_x86_64
 # Install go
+ONBUILD ARG BRANCH
 ONBUILD ARG GOVERSION
 ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/
 ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
@@ -24,6 +25,7 @@ ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -o APT::Immediat
 
 FROM debian:bullseye as build_aarch64
 # Install go
+ONBUILD ARG BRANCH
 ONBUILD ARG GOVERSION
 ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/
 ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
@@ -64,9 +66,8 @@ ENV MAKE "make --jobs $(grep -c processor /proc/cpuinfo)"
 # Preseed the go module cache and the ruby gems, using the currently checked
 # out branch of the source tree. This avoids potential compatibility issues
 # between the version of Ruby and certain gems.
-RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \
+RUN git clone --depth 1 --branch ${BRANCH} git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados && \
-    if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \

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


hooks/post-receive
--