15370: Bump docker API version to 1.35.

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

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index f15b37ae45be96c6e5c37d3bfdf35fd47d248604..d8dbdcc4a066c18bb8df7fdcba31eb3cd8a8d45e 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"
 )
@@ -92,7 +93,9 @@ rm /etc/apt/sources.list.d/arvados-local.list
                cmd.Args = append(cmd.Args,
                        "--env=domain="+opts.Live,
                        "--env=bootargs=",
-                       "--publish=:4430-4450:4430-4450",
+                       "--publish=:443:443",
+                       "--publish=:4440-4460:4440-4460",
+                       "--publish=:9000-9020:9000-9020",
                        "--add-host="+opts.Live+":0.0.0.0",
                        "--volume=/var/lib/acme:/var/lib/acme:ro")
        } else {
@@ -120,7 +123,7 @@ 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 $bootargs
+exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
 `)
        cmd.Stdout = stdout
        cmd.Stderr = stderr
@@ -132,7 +135,7 @@ exec arvados-server boot -listen-host=0.0.0.0 $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
        }