[arvados] updated: 2.1.0-2751-ga2d23c038
git repository hosting
git at public.arvados.org
Wed Jul 20 18:04:56 UTC 2022
Summary of changes:
doc/install/automatic.html.textile.liquid | 10 +++++-----
lib/boot/passenger.go | 3 ++-
lib/install/deps.go | 3 ++-
lib/install/init.go | 20 +++++++++++++++-----
4 files changed, 24 insertions(+), 12 deletions(-)
via a2d23c038780134c812249e74d9e6d1b7cad69b6 (commit)
via a4fc0df348d192c2b147d4964c0dfa4079e2181f (commit)
via 84ef8710cb1c020688ff210bca965051eee9e09e (commit)
via d0a076cc20d4e67c5695268b1dbf5e6862eab5b0 (commit)
from fa502f7616688af482e614e1a30cd6dd341e2dec (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 a2d23c038780134c812249e74d9e6d1b7cad69b6
Author: Tom Clegg <tom at curii.com>
Date: Wed Jul 20 14:02:21 2022 -0400
17344: Link next steps to appropriate doc pages.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/install/automatic.html.textile.liquid b/doc/install/automatic.html.textile.liquid
index 9923767dd..33c6fd3d3 100644
--- a/doc/install/automatic.html.textile.liquid
+++ b/doc/install/automatic.html.textile.liquid
@@ -58,10 +58,10 @@ h2. Initialize the cluster
When the "init" command is finished, navigate to the link shown in the terminal (e.g., @https://x9999.example.com/@) and log in with the account you created above.
-Activate your new Arvados user account.
+Activate your new Arvados user account. Copy the UUID (looks like @x9999-tpzed-xxxxxxxxxxxxxxx@) from your browser's location bar and run:
<pre>
-# arv sudo user setup exampleUserName
+# arv sudo user setup --uuid x9999-tpzed-xxxxxxxxxxxxxxx
</pre>
Run the diagnostics tool to ensure everything is working.
@@ -74,9 +74,9 @@ h2. Customize the cluster
Things you should plan to update before using your cluster in production:
* "Set up Google login":{{site.baseurl}}/install/setup-login.html or another authentication option.
-* Set up a wildcard TLS certificate and DNS name, or enable @TrustAllContent@ mode.
-* Update storage configuration to use a cloud storage bucket instead of the local filesystem.
-* Update CloudVMs configuration to use a cloud provider to bring up VMs on demand instead of running containers on the server host.
+* "Set up a wildcard TLS certificate and DNS name,":{{site.baseurl}}/install/install-manual-prerequisites.html#dnstls or enable @TrustAllContent@ mode.
+* Update storage configuration to use a cloud storage bucket ("S3":{{site.baseurl}}/install/configure-s3-object-storage.html or "Azure":{{site.baseurl}}/install/configure-azure-blob-storage.html) instead of the local filesystem.
+* Update "CloudVMs configuration":{{site.baseurl}}/install/crunch2-cloud/install-dispatch-cloud.html to use a cloud provider to bring up VMs on demand instead of running containers on the server host.
h2. Updating configuration
commit a4fc0df348d192c2b147d4964c0dfa4079e2181f
Author: Tom Clegg <tom at curii.com>
Date: Tue Jul 19 17:35:49 2022 -0400
17344: Point to diagnostics and docs after successful init.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/init.go b/lib/install/init.go
index 2992b6677..14e2eaafa 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -392,7 +392,12 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
fmt.Fprintln(stderr, "docker is not installed -- skipping step of downloading 'alpine' image")
}
- fmt.Fprintln(stderr, "Setup complete. You should now be able to log in to workbench2 at", cluster.Services.Workbench2.ExternalURL.String())
+ fmt.Fprintf(stderr, `
+Setup complete. Next steps:
+* run 'arv sudo diagnostics'
+* log in to workbench2 at %s
+* see documentation at https://doc.arvados.org/install/automatic.html
+`, cluster.Services.Workbench2.ExternalURL.String())
return 0
}
commit 84ef8710cb1c020688ff210bca965051eee9e09e
Author: Tom Clegg <tom at curii.com>
Date: Tue Jul 19 17:35:27 2022 -0400
17344: Fix available-port check.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/init.go b/lib/install/init.go
index b48edcd4a..2992b6677 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -115,10 +115,15 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
return 1
}
- err = initcmd.checkPort(ctx, "4440")
- err = initcmd.checkPort(ctx, "443")
- if initcmd.TLS == "auto" {
- err = initcmd.checkPort(ctx, "80")
+ ports := []int{443}
+ for i := 4440; i < 4460; i++ {
+ ports = append(ports, i)
+ }
+ if initcmd.TLS == "acme" {
+ ports = append(ports, 80)
+ }
+ for _, port := range ports {
+ err = initcmd.checkPort(ctx, fmt.Sprintf("%d", port))
if err != nil {
return 1
}
commit d0a076cc20d4e67c5695268b1dbf5e6862eab5b0
Author: Tom Clegg <tom at curii.com>
Date: Tue Jul 19 17:34:17 2022 -0400
17344: Use #cpus as 'bundle install' concurrency.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index e0eec5ee4..5367337e8 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -10,6 +10,7 @@ import (
"fmt"
"os"
"path/filepath"
+ "runtime"
"strings"
"sync"
@@ -96,7 +97,7 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
if err != nil {
return err
}
- err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", "4")
+ err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", fmt.Sprintf("%d", runtime.NumCPU()))
if err != nil {
return err
}
diff --git a/lib/install/deps.go b/lib/install/deps.go
index a5c428d0a..187bac4b4 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -17,6 +17,7 @@ import (
"os/exec"
"os/user"
"path/filepath"
+ "runtime"
"strconv"
"strings"
"syscall"
@@ -644,7 +645,7 @@ done
{"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"},
- {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--jobs", "8"},
+ {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--jobs", fmt.Sprintf("%d", runtime.NumCPU())},
{"chown", "www-data:www-data", ".", "public/assets"},
// {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "system", "true"},
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list