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 ff6ead0facc26bbb0e1141d118b4cd81a70ec4c0..b3eacfe31ed50986ea02223858117f4742d7e474 100755 (executable)
--- 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 6a2c4b61f5a93584fa3a4ba023e2b25b1a5a545c..f18300c4cc68f711faf66d1f9f8de4b9fe254f14 100644 (file)
--- 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 d28823f4ac1ff56838304c1b6c3af39debb498f6..f9b962fdd8adfd079c2253c7210d85fd188b97b0 100644 (file)
--- 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"},