[arvados] updated: 2.6.0-425-ga3b9be6df
git repository hosting
git at public.arvados.org
Fri Aug 4 16:32:27 UTC 2023
Summary of changes:
build/package-build-dockerfiles/Makefile | 2 +-
.../build-all-build-containers.sh | 7 +++++--
build/package-build-dockerfiles/centos7/Dockerfile | 3 ++-
build/package-build-dockerfiles/debian10/Dockerfile | 3 ++-
build/package-build-dockerfiles/debian11/Dockerfile | 3 ++-
build/package-build-dockerfiles/rocky8/Dockerfile | 3 ++-
build/package-build-dockerfiles/ubuntu1804/Dockerfile | 3 ++-
build/package-build-dockerfiles/ubuntu2004/Dockerfile | 3 ++-
build/package-test-dockerfiles/centos7/Dockerfile | 4 +++-
build/package-test-dockerfiles/debian10/Dockerfile | 4 +++-
build/package-test-dockerfiles/debian11/Dockerfile | 4 +++-
build/package-test-dockerfiles/rocky8/Dockerfile | 4 +++-
build/package-test-dockerfiles/ubuntu1804/Dockerfile | 4 +++-
build/package-test-dockerfiles/ubuntu2004/Dockerfile | 4 +++-
build/rails-package-scripts/postinst.sh | 2 +-
build/run-build-packages-one-target.sh | 8 ++++++--
build/run-tests.sh | 16 +++++++---------
lib/boot/passenger.go | 13 ++++++-------
lib/install/deps.go | 7 +++----
lib/install/deps_go_version_test.go | 2 +-
tools/arvbox/bin/arvbox | 2 +-
tools/arvbox/lib/arvbox/docker/common.sh | 3 +--
tools/compute-images/build.sh | 2 +-
23 files changed, 63 insertions(+), 43 deletions(-)
via a3b9be6df9a043138aabc9408ff63721405b6589 (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 a3b9be6df9a043138aabc9408ff63721405b6589
Author: Tom Clegg <tom at curii.com>
Date: Fri Aug 4 12:29:35 2023 -0400
20735: Update bundler, change things to use lib/install const.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 416e746d2..8dffd8464 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -31,7 +31,7 @@ ubuntu2004/generated: common-generated-all
GOTARBALL_=DOES_NOT_EXIST
NODETARBALL_=DOES_NOT_EXIST
-GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}')
+GOVERSION=$(shell egrep 'goversion +=' ../../lib/install/deps.go |awk -F'"' '{print $$2}')
GOTARBALL_x86_64=go$(GOVERSION).linux-amd64.tar.gz
NODETARBALL_x86_64=node-v10.23.1-linux-x64.tar.xz
GOTARBALL_aarch64=go$(GOVERSION).linux-arm64.tar.gz
diff --git a/build/package-build-dockerfiles/build-all-build-containers.sh b/build/package-build-dockerfiles/build-all-build-containers.sh
index b1eba93ae..f1f9428d0 100755
--- a/build/package-build-dockerfiles/build-all-build-containers.sh
+++ b/build/package-build-dockerfiles/build-all-build-containers.sh
@@ -5,7 +5,8 @@
make
-GOVERSION=$(grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $2}')
+BUNDLERVERSION=$(egrep 'BundlerVersion +=' ../../lib/install/deps.go |awk -F'"' '{print $2}')
+GOVERSION=$(egrep 'goversion +=' ../../lib/install/deps.go |awk -F'"' '{print $2}')
for target in `find -maxdepth 1 -type d |grep -v generated`; do
if [[ "$target" == "." ]]; then
@@ -17,6 +18,8 @@ for target in `find -maxdepth 1 -type d |grep -v generated`; do
docker build --tag arvados/build:$target \
--build-arg HOSTTYPE=$HOSTTYPE \
--build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
- --build-arg GOVERSION=$GOVERSION --no-cache .
+ --build-arg BUNDLERVERSION=$BUNDLERVERSION \
+ --build-arg GOVERSION=$GOVERSION \
+ --no-cache .
cd ..
done
diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index f0ae5df3f..538efe30e 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -4,6 +4,7 @@
ARG HOSTTYPE
ARG BRANCH
+ARG BUNDLERVERSION
ARG GOVERSION
FROM centos:7 as build_x86_64
@@ -43,7 +44,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.2.19 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION} && \
/usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
# Install Bash 4.4.12 // see https://dev.arvados.org/issues/15612
diff --git a/build/package-build-dockerfiles/debian10/Dockerfile b/build/package-build-dockerfiles/debian10/Dockerfile
index bc4a8beca..f032c62ae 100644
--- a/build/package-build-dockerfiles/debian10/Dockerfile
+++ b/build/package-build-dockerfiles/debian10/Dockerfile
@@ -4,6 +4,7 @@
ARG HOSTTYPE
ARG BRANCH
+ARG BUNDLERVERSION
ARG GOVERSION
## dont use debian:10 here since the word 'buster' is used for rvm precompiled binaries
@@ -48,7 +49,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.2.19 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION} && \
/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-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index ddbe1114f..38edaae5d 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -4,6 +4,7 @@
ARG HOSTTYPE
ARG BRANCH
+ARG BUNDLERVERSION
ARG GOVERSION
## dont use debian:11 here since the word 'bullseye' is used for rvm precompiled binaries
@@ -54,7 +55,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
/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 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION} && \
/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-build-dockerfiles/rocky8/Dockerfile b/build/package-build-dockerfiles/rocky8/Dockerfile
index 217de9140..b52ae3902 100644
--- a/build/package-build-dockerfiles/rocky8/Dockerfile
+++ b/build/package-build-dockerfiles/rocky8/Dockerfile
@@ -4,6 +4,7 @@
ARG HOSTTYPE
ARG BRANCH
+ARG BUNDLERVERSION
ARG GOVERSION
FROM rockylinux:8.6-minimal as build_x86_64
@@ -73,7 +74,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 ${BUNDLERVERSION} && \
/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-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index 80a98aada..72e13c03d 100644
--- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@ -4,6 +4,7 @@
ARG HOSTTYPE
ARG BRANCH
+ARG BUNDLERVERSION
ARG GOVERSION
FROM ubuntu:bionic as build_x86_64
@@ -47,7 +48,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.2.19 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION} && \
/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-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
index da45077a4..e3ca9f54b 100644
--- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
@@ -4,6 +4,7 @@
ARG HOSTTYPE
ARG BRANCH
+ARG BUNDLERVERSION
ARG GOVERSION
FROM ubuntu:focal as build_x86_64
@@ -58,7 +59,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.2.19 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION} && \
/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/centos7/Dockerfile b/build/package-test-dockerfiles/centos7/Dockerfile
index 1010ef8c4..4aefab362 100644
--- a/build/package-test-dockerfiles/centos7/Dockerfile
+++ b/build/package-test-dockerfiles/centos7/Dockerfile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+ARG BUNDLERVERSION
+
FROM centos:7
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
@@ -17,7 +19,7 @@ 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.2.9
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION}
# Install Bash 4.4.12 // see https://dev.arvados.org/issues/15612
RUN cd /usr/local/src \
diff --git a/build/package-test-dockerfiles/debian10/Dockerfile b/build/package-test-dockerfiles/debian10/Dockerfile
index e4b79930e..d7a4c90f1 100644
--- a/build/package-test-dockerfiles/debian10/Dockerfile
+++ b/build/package-test-dockerfiles/debian10/Dockerfile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+ARG BUNDLERVERSION
+
FROM debian:buster
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
@@ -19,7 +21,7 @@ RUN gpg --import --no-tty /tmp/mpapis.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 alias create default ruby-2.7 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION}
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
diff --git a/build/package-test-dockerfiles/debian11/Dockerfile b/build/package-test-dockerfiles/debian11/Dockerfile
index a659e105d..258dcc68f 100644
--- a/build/package-test-dockerfiles/debian11/Dockerfile
+++ b/build/package-test-dockerfiles/debian11/Dockerfile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+ARG BUNDLERVERSION
+
FROM debian:bullseye
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
@@ -20,7 +22,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
/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
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION}
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
diff --git a/build/package-test-dockerfiles/rocky8/Dockerfile b/build/package-test-dockerfiles/rocky8/Dockerfile
index c8f75ae0e..28c66c90a 100644
--- a/build/package-test-dockerfiles/rocky8/Dockerfile
+++ b/build/package-test-dockerfiles/rocky8/Dockerfile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+ARG BUNDLERVERSION
+
FROM rockylinux:8.6-minimal
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
@@ -43,6 +45,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 ${BUNDLERVERSION}
COPY localrepo.repo /etc/yum.repos.d/localrepo.repo
diff --git a/build/package-test-dockerfiles/ubuntu1804/Dockerfile b/build/package-test-dockerfiles/ubuntu1804/Dockerfile
index 64894d799..ae0243661 100644
--- a/build/package-test-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1804/Dockerfile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+ARG BUNDLERVERSION
+
FROM ubuntu:bionic
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
@@ -19,7 +21,7 @@ RUN gpg --import --no-tty /tmp/mpapis.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 alias create default ruby-2.7 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION}
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
diff --git a/build/package-test-dockerfiles/ubuntu2004/Dockerfile b/build/package-test-dockerfiles/ubuntu2004/Dockerfile
index df1e71e75..d139d9b38 100644
--- a/build/package-test-dockerfiles/ubuntu2004/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu2004/Dockerfile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+ARG BUNDLERVERSION
+
FROM ubuntu:focal
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
@@ -19,7 +21,7 @@ RUN gpg --import --no-tty /tmp/mpapis.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 alias create default ruby-2.7 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version ${BUNDLERVERSION}
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh
index f6ae48c0f..7ba214f8b 100644
--- a/build/rails-package-scripts/postinst.sh
+++ b/build/rails-package-scripts/postinst.sh
@@ -199,7 +199,7 @@ configure_version() {
export RAILS_ENV=production
if ! $COMMAND_PREFIX bundle --version >/dev/null 2>&1; then
- run_and_report "Installing bundler" $COMMAND_PREFIX gem install bundler --version 2.2.19 --no-document
+ run_and_report "Installing bundler" $COMMAND_PREFIX gem install bundler --version 2.4.18 --no-document
fi
run_and_report "Running bundle config set --local path $SHARED_PATH/vendor_bundle" \
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 7b51264ce..dc5105a15 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -191,14 +191,17 @@ else
make "$TARGET/generated"
fi
-GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
+BUNDLERVERSION=$(egrep 'BundlerVersion +=' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
+GOVERSION=$(egrep 'goversion +=' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
echo $TARGET
cd $TARGET
time docker build --tag "$IMAGE" \
--build-arg HOSTTYPE=$HOSTTYPE \
--build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
- --build-arg GOVERSION=$GOVERSION --no-cache .
+ --build-arg BUNDLERVERSION=$BUNDLERVERSION \
+ --build-arg GOVERSION=$GOVERSION \
+ --no-cache .
popd
if test -z "$packages" ; then
@@ -286,6 +289,7 @@ if [[ -n "$test_packages" ]]; then
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "TARGET=$TARGET" \
--env "WORKSPACE=/arvados" \
+ --env "BUNDLERVERSION=${BUNDLERVERSION}" \
"$IMAGE" $COMMAND $p
then
echo "OK: $p test on $IMAGE succeeded" >&2
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 765b31379..8c1d74e3f 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -518,10 +518,10 @@ setup_ruby_environment() {
|| fatal 'rvm gemset setup'
rvm env
- (bundle version | grep -q 2.2.19) || gem install --no-document bundler -v 2.2.19
+ (bundle version | grep -q ${BUNDLERVERSION}) || gem install --no-document bundler -v ${BUNDLERVERSION}
bundle="$(which bundle)"
echo "$bundle"
- "$bundle" version | grep 2.2.19 || fatal 'install bundler'
+ "$bundle" version | grep ${BUNDLERVERSION} || fatal 'install bundler'
else
# When our "bundle install"s need to install new gems to
# satisfy dependencies, we want them to go where "gem install
@@ -550,13 +550,9 @@ setup_ruby_environment() {
bundle="bundle"
(
export HOME=$GEMHOME
- versions=(2.2.19)
- for v in ${versions[@]}; do
- if ! gem list --installed --version "${v}" bundler >/dev/null; then
- gem install --no-document --user $(for v in ${versions[@]}; do echo bundler:${v}; done)
- break
- fi
- done
+ if ! gem list --installed --version "${BUNDLERVERSION}" bundler >/dev/null; then
+ gem install --no-document --user "bundler:${BUNDLERVERSION}"
+ fi
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
if test -d /var/lib/arvados-arvbox/ ; then
@@ -602,6 +598,8 @@ initialize() {
echo "WORKSPACE=$WORKSPACE"
+ BUNDLERVERSION=$(egrep 'BundlerVersion +=' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
+
# Clean up .pyc files that may exist in the workspace
cd "$WORKSPACE"
find -name '*.pyc' -delete
diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 5367337e8..081fa99fc 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -14,6 +14,7 @@ import (
"strings"
"sync"
+ "git.arvados.org/arvados.git/lib/install"
"git.arvados.org/arvados.git/sdk/go/arvados"
)
@@ -84,14 +85,12 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
if err != nil {
return err
}
- for _, version := range []string{"2.2.19"} {
- if !strings.Contains(buf.String(), "("+version+")") {
- err = super.RunProgram(ctx, appdir, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:2.2.19")
- if err != nil {
- return err
- }
- break
+ if !strings.Contains(buf.String(), "("+install.BundlerVersion+")") {
+ err = super.RunProgram(ctx, appdir, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:"+install.BundlerVersion)
+ if err != nil {
+ return err
}
+ break
}
err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "config", "--set", "local", "path", filepath.Join(os.Getenv("HOME"), ".gem"))
if err != nil {
diff --git a/lib/install/deps.go b/lib/install/deps.go
index 4500d89f8..2dcddcb7e 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -30,11 +30,10 @@ import (
var Command cmd.Handler = &installCommand{}
-const goversion = "1.20.6"
-
const (
+ goversion = "1.20.6"
rubyversion = "2.7.7"
- bundlerversion = "2.2.19"
+ BundlerVersion = "2.4.18"
singularityversion = "3.10.4"
pjsversion = "1.9.8"
geckoversion = "0.24.0"
@@ -643,7 +642,7 @@ done
{"mkdir", "-p", "log", "public/assets", "tmp", "vendor", ".bundle", "/var/www/.bundle", "/var/www/.gem", "/var/www/.npm", "/var/www/.passenger"},
{"touch", "log/production.log"},
{"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.bundle", "/var/www/.gem", "/var/www/.npm", "/var/www/.passenger", "log", "tmp", "vendor", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
- {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:" + bundlerversion},
+ {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:" + BundlerVersion},
{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "deployment", "true"},
{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "path", "/var/www/.gem"},
{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "without", "development test diagnostics performance"},
diff --git a/lib/install/deps_go_version_test.go b/lib/install/deps_go_version_test.go
index a434c834d..42a544206 100644
--- a/lib/install/deps_go_version_test.go
+++ b/lib/install/deps_go_version_test.go
@@ -28,7 +28,7 @@ type Suite struct{}
func (*Suite) TestExtractGoVersion(c *check.C) {
script := `
sourcepath="$(realpath ../..)"
- (cd ${sourcepath} && grep 'const goversion =' lib/install/deps.go |awk -F'"' '{print $2}')
+ (cd ${sourcepath} && egrep 'goversion +=' lib/install/deps.go |awk -F'"' '{print $2}')
`
cmd := exec.Command("bash", "-")
cmd.Stdin = bytes.NewBufferString("set -ex -o pipefail\n" + script)
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index b3b9a5fcb..223307fec 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -390,7 +390,7 @@ build() {
set -e
# Get the go version we should use for bootstrapping
- GO_VERSION=`grep 'const goversion =' $LOCAL_ARVADOS_ROOT/lib/install/deps.go |awk -F'"' '{print $2}'`
+ GO_VERSION=$(egrep 'goversion +=' $LOCAL_ARVADOS_ROOT/lib/install/deps.go |awk -F'"' '{print $2}')
if test "$1" = localdemo -o "$1" = publicdemo ; then
BUILDTYPE=demo
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index d900f0377..89f9d2194 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -2,8 +2,7 @@
#
# SPDX-License-Identifier: AGPL-3.0
-export RUBY_VERSION=2.7.0
-export BUNDLER_VERSION=2.2.19
+export BUNDLER_VERSION=$(egrep 'BundlerVersion +=' /usr/src/arvados/lib/install/deps.go |awk -F'"' '{print $2}')
export DEBIAN_FRONTEND=noninteractive
export PATH=${PATH}:/usr/local/go/bin:/var/lib/arvados/bin:/usr/src/arvados/sdk/cli/binstubs
diff --git a/tools/compute-images/build.sh b/tools/compute-images/build.sh
index 6a17e8df1..ca9443a3f 100755
--- a/tools/compute-images/build.sh
+++ b/tools/compute-images/build.sh
@@ -315,7 +315,7 @@ if [[ -n "$NVIDIA_GPU_SUPPORT" ]]; then
EXTRA2+=" -var nvidia_gpu_support=$NVIDIA_GPU_SUPPORT"
fi
-GOVERSION=$(grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $2}')
+GOVERSION=$(egrep 'goversion +=' ../../lib/install/deps.go |awk -F'"' '{print $2}')
EXTRA2+=" -var goversion=$GOVERSION"
logfile=packer-$(date -Iseconds).log
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list