X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9d706659aa362728270f02b7d18d12b1f68f3e36..3c87fb14f48b78d30142f12c8cb855dba92c926d:/cmd/arvados-package/install.go

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 6b6113b952..38efae0461 100644
--- 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,6 +92,7 @@ rm /etc/apt/sources.list.d/arvados-local.list
 	if opts.Live != "" {
 		cmd.Args = append(cmd.Args,
 			"--env=domain="+opts.Live,
+			"--env=initargs=-tls=/var/lib/acme/live/"+opts.Live,
 			"--env=bootargs=",
 			"--publish=:443:443",
 			"--publish=:4440-4460:4440-4460",
@@ -100,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,
@@ -121,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
@@ -134,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
 	}