From: Tom Clegg <tom@tomclegg.ca>
Date: Fri, 24 Jul 2020 14:43:29 +0000 (-0400)
Subject: 16306: Sync bundler version to services/api/Gemfile.lock.
X-Git-Tag: 2.2.0~141^2~57
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ee7d60f02525760a2480157011659e7b2210f6b8?ds=sidebyside

16306: Sync bundler version to services/api/Gemfile.lock.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

diff --git a/build/run-tests.sh b/build/run-tests.sh
index ff6ead0fac..b3eacfe31e 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -555,7 +555,7 @@ setup_ruby_environment() {
         (
             export HOME=$GEMHOME
             bundlers="$(gem list --details bundler)"
-            versions=(1.11.0 1.17.3 2.0.2)
+            versions=(1.16.6 1.17.3 2.0.2)
             for v in ${versions[@]}; do
                 if ! echo "$bundlers" | fgrep -q "($v)"; then
                     gem install --user $(for v in ${versions[@]}; do echo bundler:${v}; done)
diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 6a2c4b61f5..f18300c4cc 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -50,9 +50,9 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 	if err != nil {
 		return err
 	}
-	for _, version := range []string{"1.11.0", "1.17.3", "2.0.2"} {
+	for _, version := range []string{"1.16.6", "1.17.3", "2.0.2"} {
 		if !strings.Contains(buf.String(), "("+version+")") {
-			err = super.RunProgram(ctx, runner.src, nil, nil, "gem", "install", "--user", "bundler:1.11", "bundler:1.17.3", "bundler:2.0.2")
+			err = super.RunProgram(ctx, runner.src, nil, nil, "gem", "install", "--user", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2")
 			if err != nil {
 				return err
 			}
diff --git a/lib/install/deps.go b/lib/install/deps.go
index d28823f4ac..f9b962fdd8 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -416,7 +416,7 @@ rm ${zip}
 				{"touch", "log/production.log"},
 				// {"chown", "-R", "root:root", "."},
 				{"chown", "-R", "www-data:www-data", "/var/www/.gem", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
-				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--no-rdoc", "--no-ri", "--conservative", "bundler:1.11", "bundler:1.17.3", "bundler:2.0.2"},
+				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--no-rdoc", "--no-ri", "--conservative", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--deployment", "--jobs", "8", "--path", "/var/www/.gem"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "build-native-support"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "install-standalone-runtime"},