aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Campbell <89273172+bigtallcampbell@users.noreply.github.com>2023-04-05 22:33:00 +0300
committerGitHub <noreply@github.com>2023-04-05 22:33:00 +0300
commit585ee2a42c8c4185d058a324fe1b996b809e52d7 (patch)
tree92036c941190914110bc747593d32c865ec4a660
parent7f605b9452ac43316a0b81d78118c5dbe00ee26e (diff)
Removing forced gid 999 for docker (#515)feature_docker-outside-of-docker_1.2.1
* Removing forced gid 999 for docker * version bump --------- Co-authored-by: Ryan Campbell <rycampbe@microsoft.com> Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
-rw-r--r--src/docker-outside-of-docker/devcontainer-feature.json2
-rwxr-xr-xsrc/docker-outside-of-docker/install.sh10
2 files changed, 7 insertions, 5 deletions
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 841bb62..2b75aa4 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
{
"id": "docker-outside-of-docker",
- "version": "1.2.0",
+ "version": "1.2.1",
"name": "Docker (docker-outside-of-docker)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
"description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 9d8433a..f32db2f 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -261,11 +261,13 @@ if ! grep -qE '^docker:' /etc/group; then
groupadd --system docker
fi
+# Remarking this out to restore functionality in Azure VMs. ID 999 is a reserved group ID
# Ensure docker group gid is 999
-if [ "$(getent group docker | cut -d: -f3)" != "999" ]; then
- echo "(*) Updating docker group gid to 999..."
- groupmod -g 999 docker
-fi
+# if [ "$(getent group docker | cut -d: -f3)" != "999" ]; then
+# echo "(*) Updating docker group gid to 999..."
+# groupmod -g 999 docker
+# fi
+
usermod -aG docker "${USERNAME}"