Merge branch '18001-add-UserNotifierEmailBcc'

[arvados.git] / lib / install / deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 255e56aaf527592db01a45d41c206469885e0eae..73aecd01e634ed844e1b4298fd2314fba3bb596e 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -178,6 +178,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
                        "r-cran-roxygen2",
                        "r-cran-xml",
                        "sudo",
+                       "uuid-dev",
                        "wget",
                        "xvfb",
                )
@@ -250,6 +251,7 @@ make install
                } else {
                        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 -
 ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/
 `, stdout, stderr)
@@ -288,7 +290,7 @@ ln -sf /var/lib/arvados/bin/geckodriver /usr/local/bin/
                        }
                }
 
-               nodejsversion := "v10.23.1"
+               nodejsversion := "v12.22.2"
                if havenodejsversion, err := exec.Command("/usr/local/bin/node", "--version").CombinedOutput(); err == nil && string(havenodejsversion) == nodejsversion+"\n" {
                        logger.Print("nodejs " + nodejsversion + " already installed")
                } else {
@@ -335,7 +337,6 @@ git checkout v${S}
 ./mconfig --prefix=/var/lib/arvados
 make -C ./builddir
 make -C ./builddir install
-rm -r ${tmp}
 `, stdout, stderr)
                        if err != nil {
                                return 1
@@ -489,7 +490,7 @@ rm -r ${tmp}
                                {"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger"},
                                {"touch", "log/production.log"},
                                {"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
-                               {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2"},
+                               {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:2.2.19"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--deployment", "--jobs", "8", "--path", "/var/www/.gem"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "build-native-support"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "install-standalone-runtime"},