projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes comment formatting. No issue #
[arvados.git]
/
lib
/
install
/
deps.go
diff --git
a/lib/install/deps.go
b/lib/install/deps.go
index 27b8d1dc8aedb70c9c5720ace830bc3bbaabd10a..dc8ec39f6f0a33507beb54a175f4c9607f6c250f 100644
(file)
--- a/
lib/install/deps.go
+++ b/
lib/install/deps.go
@@
-30,18
+30,18
@@
import (
var Command cmd.Handler = &installCommand{}
var Command cmd.Handler = &installCommand{}
-const goversion = "1.
17.7
"
+const goversion = "1.
20.6
"
const (
const (
- rubyversion = "2.7.
5
"
+ rubyversion = "2.7.
7
"
bundlerversion = "2.2.19"
bundlerversion = "2.2.19"
- singularityversion = "3.
9.9
"
+ singularityversion = "3.
10.4
"
pjsversion = "1.9.8"
geckoversion = "0.24.0"
gradleversion = "5.3.1"
pjsversion = "1.9.8"
geckoversion = "0.24.0"
gradleversion = "5.3.1"
- nodejsversion = "v12.22.1
1
"
+ nodejsversion = "v12.22.1
2
"
devtestDatabasePassword = "insecure_arvados_test"
devtestDatabasePassword = "insecure_arvados_test"
- workbench2version = "
2454ac35292a79594c32a80430740317ed5005cf"
+ workbench2version = "
9a62117dbe56bdfa42489415eb6696638c2bb336" // 2.6.3
)
//go:embed arvados.service
)
//go:embed arvados.service
@@
-155,16
+155,16
@@
func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
"default-jre-headless",
"gettext",
"libattr1-dev",
"default-jre-headless",
"gettext",
"libattr1-dev",
- "libcrypt-ssleay-perl",
"libfuse-dev",
"libfuse-dev",
+ "libgbm1", // cypress / workbench2 tests
+ "libglib2.0-dev", // common, used by singularity
"libgnutls28-dev",
"libgnutls28-dev",
- "libjson-perl",
"libpam-dev",
"libpcre3-dev",
"libpq-dev",
"libreadline-dev",
"libpam-dev",
"libpcre3-dev",
"libpq-dev",
"libreadline-dev",
+ "libseccomp-dev", // singularity
"libssl-dev",
"libssl-dev",
- "libwww-perl",
"libxml2-dev",
"libxslt1-dev",
"linkchecker",
"libxml2-dev",
"libxslt1-dev",
"linkchecker",
@@
-205,11
+205,11
@@
func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
}
switch {
case osv.Debian && osv.Major >= 11:
}
switch {
case osv.Debian && osv.Major >= 11:
- pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev"
, "perl-modules-5.32"
)
+ pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev")
case osv.Debian && osv.Major >= 10:
case osv.Debian && osv.Major >= 10:
- pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev"
, "perl-modules"
)
+ pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev")
case osv.Debian || osv.Ubuntu:
case osv.Debian || osv.Ubuntu:
- pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev"
, "perl-modules"
)
+ pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev")
case osv.Centos:
pkgs = append(pkgs, "gcc", "gcc-c++", "libcurl-devel", "postgresql-devel")
}
case osv.Centos:
pkgs = append(pkgs, "gcc", "gcc-c++", "libcurl-devel", "postgresql-devel")
}
@@
-362,7
+362,7
@@
S=`+singularityversion+`
tmp=/var/lib/arvados/tmp/singularity
trap "rm -r ${tmp}" ERR EXIT
cd /var/lib/arvados/tmp
tmp=/var/lib/arvados/tmp/singularity
trap "rm -r ${tmp}" ERR EXIT
cd /var/lib/arvados/tmp
-git clone https://github.com/sylabs/singularity
+git clone
--recurse-submodules
https://github.com/sylabs/singularity
cd singularity
git checkout v${S}
./mconfig --prefix=/var/lib/arvados
cd singularity
git checkout v${S}
./mconfig --prefix=/var/lib/arvados
@@
-509,6
+509,7
@@
setcap "cap_sys_admin+pei cap_sys_chroot+pei" /var/lib/arvados/bin/nsenter
} else {
err = inst.runBash(`
NJS=`+nodejsversion+`
} 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/
`, stdout, stderr)
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/
`, stdout, stderr)