From: Tom Clegg <tom@curii.com>
Date: Mon, 11 Jul 2022 15:28:10 +0000 (-0400)
Subject: 17344: Ensure arvados-server is in PATH for rake tasks.
X-Git-Tag: 2.5.0~115^2~23
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/86beb5fc2d508cef8e38ad0b4db8e14d68556dbb

17344: Ensure arvados-server is in PATH for rake tasks.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 11ce0f188f..57bb9af51e 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -621,8 +621,8 @@ yarn install
 
 				{"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"},
+				{"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "PATH=/var/lib/arvados/bin:" + os.Getenv("PATH"), "/var/lib/arvados/bin/bundle", "exec", "rake", "npm:install"},
+				{"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "PATH=/var/lib/arvados/bin:" + os.Getenv("PATH"), "/var/lib/arvados/bin/bundle", "exec", "rake", "assets:precompile"},
 				{"chown", "root:root", "."},
 				{"chown", "-R", "root:root", "public/assets", "vendor"},