aboutsummaryrefslogtreecommitdiff
path: root/src/common-utils
diff options
context:
space:
mode:
authoreitsupi <50911393+eitsupi@users.noreply.github.com>2023-01-11 00:50:09 +0300
committerGitHub <noreply@github.com>2023-01-11 00:50:09 +0300
commit7e32db56c00b79a2d35838ffa6f7081f517805b1 (patch)
treeee3a49b3866034c6a0b04847786fc3bb81d94712 /src/common-utils
parent59fa3e3c21fd2c896da2d3272604509ea9a55a91 (diff)
[common-utils] Fix permission of scripts in containers (#388)
* fix permission in containers * add test * bump version * more tests * update tests * Update test/common-utils/devcontainer-info/Dockerfile Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> * Update test/common-utils/scenarios.json Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> * Update scenarios.json * Update devcontainer-info.sh Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
Diffstat (limited to 'src/common-utils')
-rw-r--r--src/common-utils/devcontainer-feature.json2
-rw-r--r--src/common-utils/main.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 33cd19d..82623f9 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
{
"id": "common-utils",
- "version": "2.0.4",
+ "version": "2.0.5",
"name": "Common Utilities",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
"description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 2021485..7cc9409 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -474,18 +474,18 @@ fi
# code shim, it fallbacks to code-insiders if code is not available
cp -f "${FEATURE_DIR}/bin/code" /usr/local/bin/
-chmod +x /usr/local/bin/code
+chmod +rx /usr/local/bin/code
# systemctl shim for Debian/Ubuntu - tells people to use 'service' if systemd is not running
if [ "${ADJUSTED_ID}" = "debian" ]; then
cp -f "${FEATURE_DIR}/bin/systemctl" /usr/local/bin/systemctl
- chmod +x /usr/local/bin/systemctl
+ chmod +rx /usr/local/bin/systemctl
fi
# Persist image metadata info, script if meta.env found in same directory
if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ] || [ -f "/usr/local/etc/dev-containers/meta.env" ]; then
cp -f "${FEATURE_DIR}/bin/devcontainer-info" /usr/local/bin/devcontainer-info
- chmod +x /usr/local/bin/devcontainer-info
+ chmod +rx /usr/local/bin/devcontainer-info
fi
# Write marker file