summaryrefslogtreecommitdiffstats
path: root/src/endpoint/configured.rs
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-11-16 14:45:34 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-11-16 14:45:35 +0100
commitb4b617a42b2c160b577272c1c16b330a6d45c921 (patch)
tree29dbbeb6dd487bd453bd64669459005cef8b9136 /src/endpoint/configured.rs
parentab3fa82d8d20444738e9a062a338fcbd26963f34 (diff)
Add passing of additional env
This patch adds the code to pass the additional environment to the container job. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/endpoint/configured.rs')
-rw-r--r--src/endpoint/configured.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/endpoint/configured.rs b/src/endpoint/configured.rs
index f9a04d5..9e9171b 100644
--- a/src/endpoint/configured.rs
+++ b/src/endpoint/configured.rs
@@ -176,7 +176,7 @@ impl Endpoint {
.map(|_| ())
}
- pub async fn run_job(&self, job: RunnableJob, logsink: UnboundedSender<LogItem>, staging: Arc<RwLock<StagingStore>>) -> RResult<(Vec<PathBuf>, ContainerHash, Script), ContainerError> {
+ pub async fn run_job(&self, job: RunnableJob, logsink: UnboundedSender<LogItem>, staging: Arc<RwLock<StagingStore>>, additional_env: Vec<(String, String)>) -> RResult<(Vec<PathBuf>, ContainerHash, Script), ContainerError> {
use crate::log::buffer_stream_to_line_stream;
use tokio::stream::StreamExt;
use futures::FutureExt;
@@ -185,6 +185,7 @@ impl Endpoint {
let envs = job.environment()
.into_iter()
.chain(job.package_environment().into_iter())
+ .chain(additional_env.into_iter())
.map(|(k, v)| format!("{}={}", k, v))
.collect::<Vec<_>>();
trace!("Job resources: Environment variables = {:?}", envs);