16552: Start systemd service after successful init.

[arvados.git] / cmd / arvados-package / install.go

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 0de99cabd20489927243358a11cf9648a40e7801..9273ac9c73e4850f18d580899dfeae72b2719bd9 100644 (file)
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -14,6 +14,7 @@ import (
        "path/filepath"
        "strings"
 
+       "git.arvados.org/arvados.git/lib/crunchrun"
        "github.com/docker/docker/api/types"
        "github.com/docker/docker/client"
 )
@@ -91,7 +92,9 @@ rm /etc/apt/sources.list.d/arvados-local.list
        if opts.Live != "" {
                cmd.Args = append(cmd.Args,
                        "--env=domain="+opts.Live,
+                       "--env=initargs=-tls=acme",
                        "--env=bootargs=",
+                       "--publish=:443:443",
                        "--publish=:4440-4460:4440-4460",
                        "--publish=:9000-9020:9000-9020",
                        "--add-host="+opts.Live+":0.0.0.0",
@@ -99,6 +102,7 @@ rm /etc/apt/sources.list.d/arvados-local.list
        } else {
                cmd.Args = append(cmd.Args,
                        "--env=domain=localhost",
+                       "--env=initargs=-tls=insecure",
                        "--env=bootargs=-shutdown")
        }
        cmd.Args = append(cmd.Args,
@@ -120,8 +124,8 @@ eatmydata apt-get install --reinstall -y --no-install-recommends arvados-server-
 SUDO_FORCE_REMOVE=yes apt-get autoremove -y
 
 /etc/init.d/postgresql start
-arvados-server init -cluster-id x1234 -domain=$domain -login=test -insecure
-exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
+arvados-server init -cluster-id x1234 -domain=$domain -login=test -start=false $initargs
+exec arvados-server boot -listen-host=0.0.0.0 $bootargs
 `)
        cmd.Stdout = stdout
        cmd.Stderr = stderr
@@ -133,7 +137,7 @@ exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
 }
 
 func dockerImageExists(ctx context.Context, name string) (bool, error) {
-       cli, err := client.NewEnvClient()
+       cli, err := client.NewClient(client.DefaultDockerHost, crunchrun.DockerAPIVersion, nil, nil)
        if err != nil {
                return false, err
        }