[ARVADOS] updated: 2.1.0-2162-gfe0c81c57

[Git user]

Summary of changes:
 cmd/arvados-package/install.go | 1 +
 lib/install/init.go            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  fe0c81c57f073e69bd334bd456046d88bd5f58df (commit)
       via  86e19885e3d33d0d78bfff72dd6da5cf01060e75 (commit)
      from  e4f8cfe369d669444873ded465d6196d3d1ad5a8 (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 fe0c81c57f073e69bd334bd456046d88bd5f58df
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 24 10:20:45 2022 -0400

    18700: Add /etc/hosts entry so ExternalURLs resolve in container.
    
    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 217391465..af72c2c39 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -93,6 +93,7 @@ rm /etc/apt/sources.list.d/arvados-local.list
 			"--env=domain="+opts.Live,
 			"--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")
 	} else {
 		cmd.Args = append(cmd.Args,

commit 86e19885e3d33d0d78bfff72dd6da5cf01060e75
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 24 10:20:33 2022 -0400

    18700: Fix websocket ExternalURL.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/init.go b/lib/install/init.go
index 98f9fffd0..8e7f181c4 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -112,7 +112,7 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
       Websocket:
         InternalURLs:
           "http://0.0.0.0:8005/": {}
-        ExternalURL: {{printf "%q" ( print "wss://." .Domain ":4436/" ) }}
+        ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4436/websocket" ) }}
       Keepbalance:
         InternalURLs:
           "http://0.0.0.0:9005/": {}

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


hooks/post-receive
--