From 99bfaeb5abd69c413e89f75c9a8bf14a6ac1cee7 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Thu, 9 Jun 2022 18:13:08 +0000 Subject: [PATCH] oryx: change and own DYNAMIC_INSTALL_ROOT_DIR --- src/oryx/devcontainer-feature.json | 2 +- src/oryx/install.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json index c526893..6315a43 100644 --- a/src/oryx/devcontainer-feature.json +++ b/src/oryx/devcontainer-feature.json @@ -5,7 +5,7 @@ "PATH": "usr/local/oryx:${PATH}", "ORYX_SDK_STORAGE_BASE_URL": "https://oryx-cdn.microsoft.io", "ENABLE_DYNAMIC_INSTALL": "true", - "DYNAMIC_INSTALL_ROOT_DIR": "/usr/local" + "DYNAMIC_INSTALL_ROOT_DIR": "/tmp/oryx-platforms" }, "install": { "app": "", diff --git a/src/oryx/install.sh b/src/oryx/install.sh index 2a41dd7..0c5b937 100755 --- a/src/oryx/install.sh +++ b/src/oryx/install.sh @@ -118,8 +118,11 @@ if ! oryx --version > /dev/null ; then ln -s ${BUILD_SCRIPT_GENERATOR}/GenerateBuildScript ${ORYX}/oryx cp -f $GIT_ORYX/images/build/benv.sh ${ORYX}/benv - updaterc "export PATH=$PATH:/usr/local/oryx && export ORYX_SDK_STORAGE_BASE_URL=https://oryx-cdn.microsoft.io && export ENABLE_DYNAMIC_INSTALL=true && DYNAMIC_INSTALL_ROOT_DIR=/usr/local" - chown -R ${USERNAME} /usr/local/ + ORYX_INSTALL_DIR="/tmp/oryx-platforms" + mkdir -p "${ORYX_INSTALL_DIR}" + chown -R ${USERNAME} "${ORYX_INSTALL_DIR}" + + updaterc "export PATH=$PATH:/usr/local/oryx && export ORYX_SDK_STORAGE_BASE_URL=https://oryx-cdn.microsoft.io && export ENABLE_DYNAMIC_INSTALL=true && DYNAMIC_INSTALL_ROOT_DIR=$ORYX_INSTALL_DIR" fi echo "Done!"