From 7e32db56c00b79a2d35838ffa6f7081f517805b1 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Wed, 11 Jan 2023 06:50:09 +0900 Subject: [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 * Update test/common-utils/scenarios.json Co-authored-by: Samruddhi Khandale * Update scenarios.json * Update devcontainer-info.sh Co-authored-by: Samruddhi Khandale --- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/main.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/common-utils') 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 -- cgit v1.2.3