From a787c33229a41c43d74979a56b571da324688c41 Mon Sep 17 00:00:00 2001 From: Felix Abecassis Date: Fri, 8 Dec 2017 17:13:01 -0800 Subject: [PATCH] lxc-oci: add support for WorkingDir Signed-off-by: Felix Abecassis --- templates/lxc-oci.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/templates/lxc-oci.in b/templates/lxc-oci.in index 3348745a0..95777e086 100755 --- a/templates/lxc-oci.in +++ b/templates/lxc-oci.in @@ -140,6 +140,21 @@ getuidgid() { return } +# get cwd from oci image. +getcwd() { + if [ "$#" -eq 0 ]; then + echo "/" + return + fi + + configpath="$1" + + cwd=`cat "${configpath}" | jq -c -r '.config.WorkingDir // "/"'` + + echo "${cwd}" + return +} + usage() { cat <> "${LXC_CONF_FILE}" echo "lxc.init.gid = ${uidgid[1]}" >> "${LXC_CONF_FILE}" +cwd=$(getcwd ${OCI_CONF_FILE}) +echo "lxc.init.cwd = ${cwd}" >> "${LXC_CONF_FILE}" + if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ]; then chown $LXC_MAPPED_UID $LXC_PATH/config $LXC_PATH/fstab >/dev/null 2>&1 || true fi -- 2.47.2