X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5f778e6945d8c3c216922f9aa1f45253a1c62376..c272d74463c393c967f0bdc3a9f3de626f3e5e7c:/lib/install/deps.go diff --git a/lib/install/deps.go b/lib/install/deps.go index 998da1200c..f9795cf872 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -34,27 +34,29 @@ var Command cmd.Handler = &installCommand{} const goversion = "1.20.6" const ( - defaultRubyVersion = "3.2.2" - defaultBundlerVersion = "2.2.19" - singularityversion = "3.10.4" - pjsversion = "1.9.8" - geckoversion = "0.24.0" - gradleversion = "5.3.1" - nodejsversion = "v12.22.12" - devtestDatabasePassword = "insecure_arvados_test" + defaultRubyVersion = "3.2.2" + defaultBundlerVersion = "2.2.19" + defaultSingularityVersion = "3.10.4" + pjsversion = "1.9.8" + geckoversion = "0.24.0" + gradleversion = "5.3.1" + defaultNodejsVersion = "14.21.3" + devtestDatabasePassword = "insecure_arvados_test" ) //go:embed arvados.service var arvadosServiceFile []byte type installCommand struct { - ClusterType string - SourcePath string - Commit string - PackageVersion string - RubyVersion string - BundlerVersion string - EatMyData bool + ClusterType string + SourcePath string + Commit string + PackageVersion string + RubyVersion string + BundlerVersion string + SingularityVersion string + NodejsVersion string + EatMyData bool } func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int { @@ -79,6 +81,8 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read flags.StringVar(&inst.PackageVersion, "package-version", "0.0.0", "version string to embed in executable files") flags.StringVar(&inst.RubyVersion, "ruby-version", defaultRubyVersion, "Ruby `version` to install (do not override in production mode)") flags.StringVar(&inst.BundlerVersion, "bundler-version", defaultBundlerVersion, "Bundler `version` to install (do not override in production mode)") + flags.StringVar(&inst.SingularityVersion, "singularity-version", defaultSingularityVersion, "Singularity `version` to install (do not override in production mode)") + flags.StringVar(&inst.NodejsVersion, "nodejs-version", defaultNodejsVersion, "Nodejs `version` to install (not applicable in production mode)") flags.BoolVar(&inst.EatMyData, "eatmydata", false, "use eatmydata to speed up install") if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok { @@ -117,11 +121,19 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read if ok, _ := regexp.MatchString(`^\d\.\d+\.\d+$`, inst.RubyVersion); !ok { fmt.Fprintf(stderr, "invalid argument %q for -ruby-version\n", inst.RubyVersion) - return 64 + return 2 } if ok, _ := regexp.MatchString(`^\d`, inst.BundlerVersion); !ok { fmt.Fprintf(stderr, "invalid argument %q for -bundler-version\n", inst.BundlerVersion) - return 64 + return 2 + } + if ok, _ := regexp.MatchString(`^\d`, inst.SingularityVersion); !ok { + fmt.Fprintf(stderr, "invalid argument %q for -singularity-version\n", inst.SingularityVersion) + return 2 + } + if ok, _ := regexp.MatchString(`^\d`, inst.NodejsVersion); !ok { + fmt.Fprintf(stderr, "invalid argument %q for -nodejs-version\n", inst.NodejsVersion) + return 2 } osv, err := identifyOS() @@ -237,7 +249,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev") case osv.Debian || osv.Ubuntu: pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev") - case osv.Centos: + case osv.RedHat: pkgs = append(pkgs, "gcc", "gcc-c++", "libcurl-devel", "postgresql-devel") } cmd := exec.CommandContext(ctx, "apt-get") @@ -261,8 +273,6 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read } else if osv.Debian { var codename string switch osv.Major { - case 10: - codename = "buster" case 11: codename = "bullseye" case 12: @@ -274,7 +284,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read err = inst.runBash(` rm -f /usr/share/keyrings/docker-archive-keyring.gpg curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg -echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian/ `+codename+` stable' | \ +echo 'deb [arch=`+runtime.GOARCH+` signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian/ `+codename+` stable' | \ tee /etc/apt/sources.list.d/docker.list apt-get update DEBIAN_FRONTEND=noninteractive apt-get --yes --no-install-recommends install docker-ce @@ -351,7 +361,7 @@ fi err = inst.runBash(` cd /tmp rm -rf /var/lib/arvados/go/ -wget --progress=dot:giga -O- https://storage.googleapis.com/golang/go`+goversion+`.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf - +wget --progress=dot:giga -O- https://storage.googleapis.com/golang/go`+goversion+`.linux-`+runtime.GOARCH+`.tar.gz | tar -C /var/lib/arvados -xzf - ln -sfv /var/lib/arvados/go/bin/* /usr/local/bin/ `, stdout, stderr) if err != nil { @@ -361,32 +371,6 @@ ln -sfv /var/lib/arvados/go/bin/* /usr/local/bin/ } if !prod && !pkg { - if havepjsversion, err := exec.Command("/usr/local/bin/phantomjs", "--version").CombinedOutput(); err == nil && string(havepjsversion) == "1.9.8\n" { - logger.Print("phantomjs " + pjsversion + " already installed") - } else { - err = inst.runBash(` -PJS=phantomjs-`+pjsversion+`-linux-x86_64 -wget --progress=dot:giga -O- https://cache.arvados.org/$PJS.tar.bz2 | tar -C /var/lib/arvados -xjf - -ln -sfv /var/lib/arvados/$PJS/bin/phantomjs /usr/local/bin/ -`, stdout, stderr) - if err != nil { - return 1 - } - } - - if havegeckoversion, err := exec.Command("/usr/local/bin/geckodriver", "--version").CombinedOutput(); err == nil && strings.Contains(string(havegeckoversion), " "+geckoversion+" ") { - logger.Print("geckodriver " + geckoversion + " already installed") - } else { - err = inst.runBash(` -GD=v`+geckoversion+` -wget --progress=dot:giga -O- https://github.com/mozilla/geckodriver/releases/download/$GD/geckodriver-$GD-linux64.tar.gz | tar -C /var/lib/arvados/bin -xzf - geckodriver -ln -sfv /var/lib/arvados/bin/geckodriver /usr/local/bin/ -`, stdout, stderr) - if err != nil { - return 1 - } - } - if havegradleversion, err := exec.Command("/usr/local/bin/gradle", "--version").CombinedOutput(); err == nil && strings.Contains(string(havegradleversion), "Gradle "+gradleversion+"\n") { logger.Print("gradle " + gradleversion + " already installed") } else { @@ -404,11 +388,11 @@ rm ${zip} } } - if havesingularityversion, err := exec.Command("/var/lib/arvados/bin/singularity", "--version").CombinedOutput(); err == nil && strings.Contains(string(havesingularityversion), singularityversion) { - logger.Print("singularity " + singularityversion + " already installed") + if havesingularityversion, err := exec.Command("/var/lib/arvados/bin/singularity", "--version").CombinedOutput(); err == nil && strings.Contains(string(havesingularityversion), inst.SingularityVersion) { + logger.Print("singularity " + inst.SingularityVersion + " already installed") } else if dev || test { err = inst.runBash(` -S=`+singularityversion+` +S=`+inst.SingularityVersion+` tmp=/var/lib/arvados/tmp/singularity trap "rm -r ${tmp}" ERR EXIT cd /var/lib/arvados/tmp @@ -553,15 +537,23 @@ setcap "cap_sys_admin+pei cap_sys_chroot+pei" /var/lib/arvados/bin/nsenter } } + var njsArch string + switch runtime.GOARCH { + case "amd64": + njsArch = "x64" + default: + njsArch = runtime.GOARCH + } + if !prod { - if havenodejsversion, err := exec.Command("/usr/local/bin/node", "--version").CombinedOutput(); err == nil && string(havenodejsversion) == nodejsversion+"\n" { - logger.Print("nodejs " + nodejsversion + " already installed") + if havenodejsversion, err := exec.Command("/usr/local/bin/node", "--version").CombinedOutput(); err == nil && string(havenodejsversion) == "v"+inst.NodejsVersion+"\n" { + logger.Print("nodejs " + inst.NodejsVersion + " already installed") } else { err = inst.runBash(` -NJS=`+nodejsversion+` -rm -rf /var/lib/arvados/node-*-linux-x64 -wget --progress=dot:giga -O- https://nodejs.org/dist/${NJS}/node-${NJS}-linux-x64.tar.xz | sudo tar -C /var/lib/arvados -xJf - -ln -sfv /var/lib/arvados/node-${NJS}-linux-x64/bin/{node,npm} /usr/local/bin/ +NJS=v`+inst.NodejsVersion+` +rm -rf /var/lib/arvados/node-*-linux-`+njsArch+` +wget --progress=dot:giga -O- https://nodejs.org/dist/${NJS}/node-${NJS}-linux-`+njsArch+`.tar.xz | sudo tar -C /var/lib/arvados -xJf - +ln -sfv /var/lib/arvados/node-${NJS}-linux-`+njsArch+`/bin/{node,npm} /usr/local/bin/ `, stdout, stderr) if err != nil { return 1 @@ -573,7 +565,7 @@ ln -sfv /var/lib/arvados/node-${NJS}-linux-x64/bin/{node,npm} /usr/local/bin/ } else { err = inst.runBash(` npm install -g yarn -ln -sfv /var/lib/arvados/node-`+nodejsversion+`-linux-x64/bin/{yarn,yarnpkg} /usr/local/bin/ +ln -sfv /var/lib/arvados/node-v`+inst.NodejsVersion+`-linux-`+njsArch+`/bin/{yarn,yarnpkg} /usr/local/bin/ `, stdout, stderr) if err != nil { return 1 @@ -807,7 +799,7 @@ rsync -a --delete-after "$tmp/build/" "$dst/" type osversion struct { Debian bool Ubuntu bool - Centos bool + RedHat bool Major int } @@ -845,10 +837,24 @@ func identifyOS() (osversion, error) { osv.Ubuntu = true case "debian": osv.Debian = true - case "centos": - osv.Centos = true default: - return osv, fmt.Errorf("unsupported ID in /etc/os-release: %q", kv["ID"]) + idLikeMatched := false + for _, idLike := range strings.Split(kv["ID_LIKE"], " ") { + switch idLike { + case "debian": + osv.Debian = true + idLikeMatched = true + case "rhel": + osv.RedHat = true + idLikeMatched = true + } + if idLikeMatched { + break + } + } + if !idLikeMatched { + return osv, fmt.Errorf("no supported ID found in /etc/os-release") + } } vstr := kv["VERSION_ID"] if i := strings.Index(vstr, "."); i > 0 { @@ -909,7 +915,7 @@ func prodpkgs(osv osversion) []string { return append(pkgs, "mime-support", // keep-web ) - } else if osv.Centos { + } else if osv.RedHat { return append(pkgs, "fuse-libs", // services/fuse "mailcap", // keep-web