Merge pull request #439 from Metaswitch/md/flokiworkingdir

Add `FLOKI_WORKING_DIR` environment variable

Author: Max Dymond

CHANGELOG.md

@@ -14,6 +14,8 @@ Status: Available for use
 ### Breaking Changes
 
 ### Added
+- Add `FLOKI_WORKING_DIR` environment variable that is accessible inside the
+  container. Can be used when `mount:` has been specified in `floki.yaml`.
 
 ### Fixed
 

docs/content/intro/feature-overview.md

@@ -181,7 +181,7 @@ These can be used to configure users in the container dynamically. This can be a
 
 The host path to the mounted directory is forwarded into the `floki` container as an environment variable, `FLOKI_HOST_MOUNTDIR`.
 
-You can set where this directory is mounted in the container using the `mount` key in `floki.yaml`.
+You can set where this directory is mounted in the container using the `mount` key in `floki.yaml`. The mount location is exposed in the `floki` container as an environment variable, `FLOKI_WORKING_DIR`.
 
 ## SSH agent
 

src/interpret.rs

@@ -23,6 +23,7 @@ pub(crate) fn run_floki_container(
     cmd = cmd.add_environment("FLOKI_HOST_MOUNTDIR", &spec.paths.root);
     cmd = cmd.add_environment("FLOKI_HOST_UID", spec.user.uid.to_string());
     cmd = cmd.add_environment("FLOKI_HOST_GID", spec.user.gid.to_string());
+    cmd = cmd.add_environment("FLOKI_WORKING_DIR", &spec.paths.internal_working_directory);
     cmd = cmd.set_working_directory(&spec.paths.internal_working_directory);
 
     if spec.user.forward {