Add environment variables to exec sync container

Signed-off-by: Martin Michaelis <code@mgjm.de>
containers · Jul 18, 2023 · 97d6b46 · 97d6b46
1 parent 0c86c1d
commit 97d6b46
Show file tree

Hide file tree

Showing 4 changed files with 234 additions and 195 deletions.
diff --git a/conmon-rs/common/proto/conmon.capnp b/conmon-rs/common/proto/conmon.capnp
@@ -73,6 +73,7 @@ interface Conmon {
         terminal @3 :Bool;
         metadataOld @4 :Data; # deprecated
         metadata @5 :Metadata; # Standard metadata to carry.
+        envVars @6 :TextTextMap;
     }
 
     struct ExecSyncContainerResponse {

diff --git a/conmon-rs/server/src/rpc.rs b/conmon-rs/server/src/rpc.rs
@@ -214,11 +214,19 @@ impl conmon::Server for Server {
 
         let command = pry!(req.get_command());
         let args = pry_err!(self.generate_exec_sync_args(&id, &pidfile, &container_io, &command));
+        let env_vars = pry!(req.get_env_vars().and_then(capnp_util::into_map));
 
         Promise::from_future(
             async move {
                 match child_reaper
-                    .create_child(&runtime, &args, false, &mut container_io, &pidfile, vec![])
+                    .create_child(
+                        &runtime,
+                        &args,
+                        false,
+                        &mut container_io,
+                        &pidfile,
+                        env_vars,
+                    )
                     .await
                 {
                     Ok((grandchild_pid, token)) => {