Upgrade unikernels with new Mirage devices

mirage · Jan 24, 2024 · 60a5455 · 60a5455
1 parent b3cfe12
commit 60a5455
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/unikernel/relay/config.ml b/unikernel/relay/config.ml
@@ -8,6 +8,10 @@ let ssh_key =
   let doc = Key.Arg.info ~doc:"The private SSH key." [ "ssh-key" ] in
   Key.(create "ssh_key" Arg.(opt (some string) None doc))
 
+let ssh_password =
+  let doc = Key.Arg.info ~doc:"The SSH password." [ "ssh-password" ] in
+  Key.(create "ssh_password" Arg.(opt (some string) None doc))
+
 let ssh_authenticator =
   let doc = Key.Arg.info ~doc:"SSH public key of the remote Git repository." [ "ssh-authenticator" ] in
   Key.(create "ssh_authenticator" Arg.(opt (some string) None doc))
@@ -48,8 +52,8 @@ let stack = generic_stackv4v6 default_network
 let dns = generic_dns_client ~nameservers stack
 let tcp = tcpv4v6_of_stackv4v6 stack
 let git_client =
-  let happy_eyeballs = git_happy_eyeballs stack dns (generic_happy_eyeballs stack dns) in
-  git_ssh ~key:ssh_key tcp happy_eyeballs
+  let happy_eyeballs = mimic_happy_eyeballs stack dns (generic_happy_eyeballs stack dns) in
+  git_ssh ~password:ssh_password ~key:ssh_key tcp happy_eyeballs
 
 let () =
   register "relay"

diff --git a/unikernel/submission/config.ml b/unikernel/submission/config.ml
@@ -8,6 +8,10 @@ let ssh_key =
   let doc = Key.Arg.info ~doc:"The private SSH key." [ "ssh-key" ] in
   Key.(create "ssh_key" Arg.(opt (some string) None doc))
 
+let ssh_password =
+  let doc = Key.Arg.info ~doc:"The SSH password." [ "ssh-password" ] in
+  Key.(create "ssh_password" Arg.(opt (some string) None doc))
+
 let ssh_authenticator =
   let doc = Key.Arg.info ~doc:"SSH public key of the remote Git repository." [ "ssh-authenticator" ] in
   Key.(create "ssh_authenticator" Arg.(opt (some string) None doc))
@@ -77,8 +81,8 @@ let stack = generic_stackv4v6 default_network
 let dns = generic_dns_client stack
 let tcp = tcpv4v6_of_stackv4v6 stack
 let git_client =
-  let happy_eyeballs = git_happy_eyeballs stack dns (generic_happy_eyeballs stack dns) in
-  git_ssh ~key:ssh_key tcp happy_eyeballs
+  let happy_eyeballs = mimic_happy_eyeballs stack dns (generic_happy_eyeballs stack dns) in
+  git_ssh ~password:ssh_password ~key:ssh_key tcp happy_eyeballs
 
 let () =
   register "submission"