X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/af7233e3695ad99ae500b51390e1bf9c1c8c5a5c..HEAD:/lib/install/deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index f9795cf872..9c5eeaccfd 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -31,11 +31,11 @@ import (
 
 var Command cmd.Handler = &installCommand{}
 
-const goversion = "1.20.6"
+const goversion = "1.21.10"
 
 const (
 	defaultRubyVersion        = "3.2.2"
-	defaultBundlerVersion     = "2.2.19"
+	defaultBundlerVersion     = "~> 2.4.0"
 	defaultSingularityVersion = "3.10.4"
 	pjsversion                = "1.9.8"
 	geckoversion              = "0.24.0"
@@ -123,7 +123,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 		fmt.Fprintf(stderr, "invalid argument %q for -ruby-version\n", inst.RubyVersion)
 		return 2
 	}
-	if ok, _ := regexp.MatchString(`^\d`, inst.BundlerVersion); !ok {
+	if ok, _ := regexp.MatchString(`^ *(|~>|[<>!=]=) *\d`, inst.BundlerVersion); !ok {
 		fmt.Fprintf(stderr, "invalid argument %q for -bundler-version\n", inst.BundlerVersion)
 		return 2
 	}
@@ -235,6 +235,10 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			} else {
 				pkgs = append(pkgs, "firefox")
 			}
+			if osv.Debian && osv.Major >= 11 {
+				// not available in Debian <11
+				pkgs = append(pkgs, "s3cmd")
+			}
 		}
 		if dev || test {
 			pkgs = append(pkgs,
@@ -347,7 +351,7 @@ make install
 if [[ "$rubyversion" > "3" ]]; then
   /var/lib/arvados/bin/gem update --no-document --system 3.4.21
 fi
-/var/lib/arvados/bin/gem install bundler --no-document
+/var/lib/arvados/bin/gem install --conservative --no-document --version '`+inst.BundlerVersion+`' bundler
 `, stdout, stderr)
 		if err != nil {
 			return 1
@@ -897,7 +901,6 @@ func prodpkgs(osv osversion) []string {
 		"curl",
 		"fuse",
 		"git",
-		"gitolite3",
 		"graphviz",
 		"haveged",
 		"libcurl3-gnutls",