Merge branch '21535-multi-wf-delete'

[arvados.git] / lib / install / init.go

diff --git a/lib/install/init.go b/lib/install/init.go
index 36501adf81e60c6b4f9c8f7919f9ee57c5c13581..12ffdd7af39b80d5dfc525d379cc6690ca0e683d 100644 (file)
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -230,10 +230,6 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
       Keepbalance:
         InternalURLs:
           "http://0.0.0.0:9019/": {}
-      GitHTTP:
-        InternalURLs:
-          "http://0.0.0.0:9005/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4445/" ) }}
       DispatchCloud:
         InternalURLs:
           "http://0.0.0.0:9006/": {}
@@ -301,8 +297,6 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
         DriverParameters:
           Root: /var/lib/arvados/keep
         Replication: 2
-    Workbench:
-      SecretKeyBase: {{printf "%q" ( .RandomHex 50 )}}
     {{if .LoginPAM}}
     Login:
       PAM:
@@ -402,29 +396,6 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
                fmt.Fprintln(stderr, "...looks good")
        }
 
-       if out, err := exec.CommandContext(ctx, "docker", "version").CombinedOutput(); err == nil && strings.Contains(string(out), "\nServer:\n") {
-               fmt.Fprintln(stderr, "loading alpine docker image for diagnostics...")
-               cmd := exec.CommandContext(ctx, "docker", "pull", "alpine")
-               cmd.Stdout = stderr
-               cmd.Stderr = stderr
-               err = cmd.Run()
-               if err != nil {
-                       err = fmt.Errorf("%v: %w", cmd.Args, err)
-                       return 1
-               }
-               cmd = exec.CommandContext(ctx, "arv", "sudo", "keep", "docker", "alpine")
-               cmd.Stdout = stderr
-               cmd.Stderr = stderr
-               err = cmd.Run()
-               if err != nil {
-                       err = fmt.Errorf("%v: %w", cmd.Args, err)
-                       return 1
-               }
-               fmt.Fprintln(stderr, "...done")
-       } else {
-               fmt.Fprintln(stderr, "docker is not installed -- skipping step of downloading 'alpine' image")
-       }
-
        fmt.Fprintf(stderr, `
 Setup complete. Next steps:
 * run 'arv sudo diagnostics'