[ARVADOS] updated: 2.1.0-2174-g13116cc7d

Git user git at public.arvados.org
Tue Apr 12 15:28:36 UTC 2022


Summary of changes:
 .../assets/javascripts/jquery.number.min.js        |  0
 cmd/arvados-package/install.go                     |  7 ++--
 lib/config/export.go                               |  3 ++
 lib/install/deps.go                                | 21 +++++++++--
 lib/install/init.go                                | 42 +++++++++++-----------
 sdk/python/tests/nginx.conf                        | 15 ++++----
 6 files changed, 56 insertions(+), 32 deletions(-)
 rename apps/workbench/{vendor => app}/assets/javascripts/jquery.number.min.js (100%)

       via  13116cc7dc549e93b0757f1948c2ac18b760c681 (commit)
       via  c3ca6b26238a510f6a8e6a91b1a725311a742cad (commit)
       via  7cb351cc32727ca7d9fb1af4543ab2718d31a9f4 (commit)
       via  0a29de2f77bcce28b89561897d1b746a8c9151ac (commit)
       via  35413d295c268b7776be2b2382e8872dc5cd1eff (commit)
       via  1a62b14f2621e4e1b15522fda45e3e1f62aaa6d9 (commit)
       via  3b08ff03f0107cb1c39f3c50546422b0ec1066e3 (commit)
      from  e28233a15116ea3c0c86d0216c686215eb2ef6c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 13116cc7dc549e93b0757f1948c2ac18b760c681
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 11:28:11 2022 -0400

    18700: Fix debian:10 install.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 178d447c3..cec24bcec 100644
--- 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")
 		}

commit c3ca6b26238a510f6a8e6a91b1a725311a742cad
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 11:01:10 2022 -0400

    18700: Renumber default/example ports to 9000-9020 and 4440-4460.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index a1b401c40..0de99cabd 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -92,7 +92,8 @@ rm /etc/apt/sources.list.d/arvados-local.list
 		cmd.Args = append(cmd.Args,
 			"--env=domain="+opts.Live,
 			"--env=bootargs=",
-			"--publish=:4430-4450:4430-4450",
+			"--publish=:4440-4460:4440-4460",
+			"--publish=:9000-9020:9000-9020",
 			"--add-host="+opts.Live+":0.0.0.0",
 			"--volume=/var/lib/acme:/var/lib/acme:ro")
 	} else {
diff --git a/lib/install/init.go b/lib/install/init.go
index 126892bc3..07c0dc1ed 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -106,53 +106,53 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
     Services:
       Controller:
         InternalURLs:
-          "http://0.0.0.0:8003/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4430/" ) }}
+          "http://0.0.0.0:9000/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4440/" ) }}
       RailsAPI:
         InternalURLs:
-          "http://0.0.0.0:8004/": {}
+          "http://0.0.0.0:9001/": {}
       Websocket:
         InternalURLs:
-          "http://0.0.0.0:8005/": {}
-        ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4435/websocket" ) }}
+          "http://0.0.0.0:9004/": {}
+        ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4444/websocket" ) }}
       Keepbalance:
         InternalURLs:
-          "http://0.0.0.0:9005/": {}
+          "http://0.0.0.0:9019/": {}
       GitHTTP:
         InternalURLs:
-          "http://0.0.0.0:9001/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4436/" ) }}
+          "http://0.0.0.0:9005/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4445/" ) }}
       DispatchCloud:
         InternalURLs:
           "http://0.0.0.0:9006/": {}
       Keepproxy:
         InternalURLs:
-          "http://0.0.0.0:25108/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4437/" ) }}
+          "http://0.0.0.0:9007/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4447/" ) }}
       WebDAV:
         InternalURLs:
-          "http://0.0.0.0:9002/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4438/" ) }}
+          "http://0.0.0.0:9008/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4448/" ) }}
       WebDAVDownload:
         InternalURLs:
-          "http://0.0.0.0:8004/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4439/" ) }}
+          "http://0.0.0.0:9009/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4449/" ) }}
       Keepstore:
         InternalURLs:
-          "http://0.0.0.0:25107/": {}
+          "http://0.0.0.0:9010/": {}
       Composer:
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4440/composer" ) }}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4459/composer" ) }}
       Workbench1:
         InternalURLs:
-          "http://0.0.0.0:8001/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4441/" ) }}
+          "http://0.0.0.0:9002/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }}
       Workbench2:
         InternalURLs:
-          "http://0.0.0.0:8002/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }}
+          "http://0.0.0.0:9003/": {}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4443/" ) }}
       Health:
         InternalURLs:
-          "http://0.0.0.0:9007/": {}
+          "http://0.0.0.0:9011/": {}
     Collections:
       BlobSigningKey: {{printf "%q" ( .RandomHex 50 )}}
       {{if .Insecure}}

commit 7cb351cc32727ca7d9fb1af4543ab2718d31a9f4
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 03:42:03 2022 -0400

    18700: Fix max keepproxy request body size.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index dd6b3e6bb..4d1e06613 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -63,6 +63,7 @@ http {
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
 
+      client_max_body_size 67108864;
       proxy_http_version 1.1;
       proxy_request_buffering off;
     }

commit 0a29de2f77bcce28b89561897d1b746a8c9151ac
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 03:02:41 2022 -0400

    18700: Run npm:install to prep workbench1 for package.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

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 069ffd0a2..178d447c3 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

commit 35413d295c268b7776be2b2382e8872dc5cd1eff
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 00:17:22 2022 -0400

    18700: Proxy workbench2 to arvados-server-boot's server.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index f15b37ae4..a1b401c40 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -120,7 +120,7 @@ SUDO_FORCE_REMOVE=yes apt-get autoremove -y
 
 /etc/init.d/postgresql start
 arvados-server init -cluster-id x1234 -domain=$domain -login=test -insecure
-exec arvados-server boot -listen-host=0.0.0.0 $bootargs
+exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
 `)
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
diff --git a/lib/install/init.go b/lib/install/init.go
index c88546da9..126892bc3 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -147,6 +147,8 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
           "http://0.0.0.0:8001/": {}
         ExternalURL: {{printf "%q" ( print "https://" .Domain ":4441/" ) }}
       Workbench2:
+        InternalURLs:
+          "http://0.0.0.0:8002/": {}
         ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }}
       Health:
         InternalURLs:
diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index 25a6f2096..dd6b3e6bb 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -157,18 +157,20 @@ http {
       proxy_redirect off;
     }
   }
+  upstream workbench2 {
+    server {{LISTENHOST}}:{{WORKBENCH2PORT}};
+  }
   server {
     listen {{LISTENHOST}}:{{WORKBENCH2SSLPORT}} ssl;
     server_name workbench2 workbench2.*;
     ssl_certificate "{{SSLCERT}}";
     ssl_certificate_key "{{SSLKEY}}";
-    location /config.json {
-      return 200 '{ "API_HOST": "{{ARVADOS_API_HOST}}" }';
-    }
     location / {
-      root      /var/lib/arvados/workbench2;
-      index     index.html;
-      try_files $uri $uri/ /index.html;
+      proxy_pass http://workbench2;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto https;
+      proxy_redirect off;
     }
   }
 }

commit 1a62b14f2621e4e1b15522fda45e3e1f62aaa6d9
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 00:15:07 2022 -0400

    18700: Export TLS.Insecure config.
    
    so workbench2 can show an appropriate
    ARVADOS_API_HOST_INSECURE=... line in the shell env script.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/export.go b/lib/config/export.go
index db413b97b..a20c5b2c3 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -219,6 +219,9 @@ var whitelist = map[string]bool{
 	"SystemLogs":                                          false,
 	"SystemRootToken":                                     false,
 	"TLS":                                                 false,
+	"TLS.Certificate":                                     false,
+	"TLS.Insecure":                                        true,
+	"TLS.Key":                                             false,
 	"Users":                                               true,
 	"Users.ActivatedUsersAreVisibleToOthers":              false,
 	"Users.AdminNotifierEmailFrom":                        false,

commit 3b08ff03f0107cb1c39f3c50546422b0ec1066e3
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 12 00:09:03 2022 -0400

    18700: Mount the whole acme dir.
    
    acmetool uses symlinks like /var/lib/acme/live/$dom/privkey ->
    ../../keys/$id/privkey
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index b49d1e347..f15b37ae4 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -94,7 +94,7 @@ rm /etc/apt/sources.list.d/arvados-local.list
 			"--env=bootargs=",
 			"--publish=:4430-4450:4430-4450",
 			"--add-host="+opts.Live+":0.0.0.0",
-			"--volume=/var/lib/acme/live/"+opts.Live+":/var/lib/acme/live/"+opts.Live+":ro")
+			"--volume=/var/lib/acme:/var/lib/acme:ro")
 	} else {
 		cmd.Args = append(cmd.Args,
 			"--env=domain=localhost",

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list