X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/01e15db1f4a331508117bc841256acec8ca361de..bfdecdcaf7dbeabfacc0efefb864e0024dbef9ab:/lib/boot/passenger.go diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go index 4203939975..f0cd02946f 100644 --- a/lib/boot/passenger.go +++ b/lib/boot/passenger.go @@ -54,9 +54,9 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super if err != nil { return err } - for _, version := range []string{"1.16.6", "1.17.3", "2.0.2"} { + for _, version := range []string{"2.2.19"} { if !strings.Contains(buf.String(), "("+version+")") { - err = super.RunProgram(ctx, runner.src, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2") + err = super.RunProgram(ctx, runner.src, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:2.2.19") if err != nil { return err } @@ -102,7 +102,7 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup if err != nil { return err } - port, err := internalPort(runner.svc) + host, port, err := internalPort(runner.svc) if err != nil { return fmt.Errorf("bug: no internalPort for %q: %v (%#v)", runner, err, runner.svc) } @@ -130,7 +130,8 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup cmdline := []string{ "bundle", "exec", "passenger", "start", - "-p", port, + "--address", host, + "--port", port, "--log-level", loglevel, "--no-friendly-error-pages", "--disable-anonymous-telemetry",