From 0a29de2f77bcce28b89561897d1b746a8c9151ac Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 12 Apr 2022 03:02:41 -0400 Subject: [PATCH] 18700: Run npm:install to prep workbench1 for package. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- .../assets/javascripts/jquery.number.min.js | 0 lib/install/deps.go | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) rename apps/workbench/{vendor => app}/assets/javascripts/jquery.number.min.js (100%) diff --git a/apps/workbench/vendor/assets/javascripts/jquery.number.min.js b/apps/workbench/app/assets/javascripts/jquery.number.min.js similarity index 100% rename from apps/workbench/vendor/assets/javascripts/jquery.number.min.js rename to apps/workbench/app/assets/javascripts/jquery.number.min.js diff --git a/lib/install/deps.go b/lib/install/deps.go index 069ffd0a2b..178d447c3f 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -576,7 +576,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 +590,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 -- 2.30.2