projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15370: Fix unspecified docker API version requirement.
[arvados.git]
/
cmd
/
arvados-package
/
install.go
diff --git
a/cmd/arvados-package/install.go
b/cmd/arvados-package/install.go
index b49d1e3473d5b38a9bf31bd875f8c38cb203c62c..437a1ad21bf43f60c054da1f256c09d4f0e4e84a 100644
(file)
--- a/
cmd/arvados-package/install.go
+++ b/
cmd/arvados-package/install.go
@@
-92,9
+92,11
@@
rm /etc/apt/sources.list.d/arvados-local.list
cmd.Args = append(cmd.Args,
"--env=domain="+opts.Live,
"--env=bootargs=",
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",
"--add-host="+opts.Live+":0.0.0.0",
- "--volume=/var/lib/acme
/live/"+opts.Live+":/var/lib/acme/live/"+opts.Live+"
:ro")
+ "--volume=/var/lib/acme
:/var/lib/acme
:ro")
} else {
cmd.Args = append(cmd.Args,
"--env=domain=localhost",
} else {
cmd.Args = append(cmd.Args,
"--env=domain=localhost",
@@
-120,7
+122,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
/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
`)
cmd.Stdout = stdout
cmd.Stderr = stderr
@@
-132,7
+134,7
@@
exec arvados-server boot -listen-host=0.0.0.0 $bootargs
}
func dockerImageExists(ctx context.Context, name string) (bool, error) {
}
func dockerImageExists(ctx context.Context, name string) (bool, error) {
- cli, err := client.New
EnvClient(
)
+ cli, err := client.New
Client(client.DefaultDockerHost, "1.21", nil, nil
)
if err != nil {
return false, err
}
if err != nil {
return false, err
}