projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' into 21160-user-activation
[arvados.git]
/
cmd
/
arvados-package
/
install.go
diff --git
a/cmd/arvados-package/install.go
b/cmd/arvados-package/install.go
index af72c2c393ae27303cec4108f90e07606d581d63..38efae0461dba43593332f353e48f883b006c6c9 100644
(file)
--- a/
cmd/arvados-package/install.go
+++ b/
cmd/arvados-package/install.go
@@
-14,6
+14,7
@@
import (
"path/filepath"
"strings"
"path/filepath"
"strings"
+ "git.arvados.org/arvados.git/lib/crunchrun"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
)
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
)
@@
-91,13
+92,17
@@
rm /etc/apt/sources.list.d/arvados-local.list
if opts.Live != "" {
cmd.Args = append(cmd.Args,
"--env=domain="+opts.Live,
if opts.Live != "" {
cmd.Args = append(cmd.Args,
"--env=domain="+opts.Live,
+ "--env=initargs=-tls=/var/lib/acme/live/"+opts.Live,
"--env=bootargs=",
"--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",
+ "--env=initargs=-tls=insecure",
"--env=bootargs=-shutdown")
}
cmd.Args = append(cmd.Args,
"--env=bootargs=-shutdown")
}
cmd.Args = append(cmd.Args,
@@
-119,7
+124,7
@@
eatmydata apt-get install --reinstall -y --no-install-recommends arvados-server-
SUDO_FORCE_REMOVE=yes apt-get autoremove -y
/etc/init.d/postgresql start
SUDO_FORCE_REMOVE=yes apt-get autoremove -y
/etc/init.d/postgresql start
-arvados-server init -cluster-id x1234 -domain=$domain -login=test
+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
exec arvados-server boot -listen-host=0.0.0.0 $bootargs
`)
cmd.Stdout = stdout
@@
-132,7
+137,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, crunchrun.DockerAPIVersion, nil, nil
)
if err != nil {
return false, err
}
if err != nil {
return false, err
}