18947: Refactor keep-web as arvados-server command.

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

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 069ffd0a2bdd9d4647b12f144d4d0772a0e606f8..62b295a1f1dca79b58d6fe4cab0f98c6b9be8b7f 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -201,8 +201,10 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
                        pkgs = append(pkgs, "squashfs-tools") // for singularity
                }
                switch {
-               case osv.Debian && osv.Major >= 10:
+               case osv.Debian && osv.Major >= 11:
                        pkgs = append(pkgs, "libcurl4", "perl-modules-5.32")
+               case osv.Debian && osv.Major >= 10:
+                       pkgs = append(pkgs, "libcurl4", "perl-modules")
                default:
                        pkgs = append(pkgs, "libcurl3", "perl-modules")
                }
@@ -521,13 +523,10 @@ yarn install
                for _, srcdir := range []string{
                        "cmd/arvados-client",
                        "cmd/arvados-server",
-                       "services/arv-git-httpd",
                        "services/crunch-dispatch-local",
                        "services/crunch-dispatch-slurm",
                        "services/health",
                        "services/keep-balance",
-                       "services/keep-web",
-                       "services/keepproxy",
                        "services/keepstore",
                        "services/ws",
                } {
@@ -576,7 +575,9 @@ yarn install
                                "-a", "--no-owner", "--no-group", "--delete-after", "--delete-excluded",
                                "--exclude", "/coverage",
                                "--exclude", "/log",
+                               "--exclude", "/node_modules",
                                "--exclude", "/tmp",
+                               "--exclude", "/public/assets",
                                "--exclude", "/vendor",
                                "--exclude", "/config/environments",
                                "./", "/var/lib/arvados/"+dstdir+"/")
@@ -588,14 +589,25 @@ yarn install
                                return 1
                        }
                        for _, cmdline := range [][]string{
-                               {"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger"},
+                               {"mkdir", "-p", "log", "public/assets", "tmp", "vendor", ".bundle", "/var/www/.bundle", "/var/www/.gem", "/var/www/.npm", "/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"},
+                               {"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.bundle", "/var/www/.gem", "/var/www/.npm", "/var/www/.passenger", "log", "tmp", "vendor", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:" + bundlerversion},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--deployment", "--jobs", "8", "--path", "/var/www/.gem", "--without", "development test diagnostics performance"},
+
+                               {"chown", "www-data:www-data", ".", "public/assets"},
+                               // {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "system", "true"},
+                               {"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "/var/lib/arvados/bin/bundle", "exec", "rake", "npm:install"},
+                               {"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "/var/lib/arvados/bin/bundle", "exec", "rake", "assets:precompile"},
+                               {"chown", "root:root", "."},
+                               {"chown", "-R", "root:root", "public/assets", "vendor"},
+
                                {"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"},
                        } {
+                               if cmdline[len(cmdline)-2] == "rake" && dstdir != "workbench1" {
+                                       continue
+                               }
                                cmd = exec.Command(cmdline[0], cmdline[1:]...)
                                cmd.Dir = "/var/lib/arvados/" + dstdir
                                cmd.Stdout = stdout