From 1397ee173c81ca686665f14d17d272080fc9c4f5 Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@microsoft.com>
Date: Fri, 18 Oct 2024 15:11:50 -0500
Subject: [PATCH] Revert "wip: fix docker socket perms"

This reverts commit 2d88dfb45cd790d9effd5b67bec491fdde6e09f3.
---
 .devcontainer/build/build-devcontainer-cli.sh | 10 ++++------
 .devcontainer/build/build-devcontainer.sh     | 11 ++++-------
 .devcontainer/scripts/run-devcontainer.sh     |  8 +++-----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/build/build-devcontainer-cli.sh b/.devcontainer/build/build-devcontainer-cli.sh
index 241cb77f19..af1328578b 100755
--- a/.devcontainer/build/build-devcontainer-cli.sh
+++ b/.devcontainer/build/build-devcontainer-cli.sh
@@ -18,13 +18,11 @@ if [ ! -w /var/run/docker.sock ]; then
     echo "ERROR: $USER does not have write access to /var/run/docker.sock. Please add $USER to the docker group." >&2
     exit 1
 fi
-docker_sock=
-if [ -e /var/run/docker-host.sock ]; then
-    docker_sock=$(readlink -f /var/run/docker-host.sock)
-else
-    docker_sock=$(readlink -f /var/run/docker.sock)
+DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS /var/run/docker.sock)
+# Make this work inside a devcontainer as well.
+if [ -w /var/run/docker-host.sock ]; then
+    DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS /var/run/docker-host.sock)
 fi
-DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS "$docker_sock")
 
 export DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1}
 devcontainer_cli_build_args=''
diff --git a/.devcontainer/build/build-devcontainer.sh b/.devcontainer/build/build-devcontainer.sh
index 3cb27e0453..0f04449c60 100755
--- a/.devcontainer/build/build-devcontainer.sh
+++ b/.devcontainer/build/build-devcontainer.sh
@@ -20,14 +20,11 @@ MLOS_AUTOTUNING_IMAGE="mlos-devcontainer:latest"
 # Build the helper container that has the devcontainer CLI for building the devcontainer.
 NO_CACHE=${NO_CACHE:-} ./build-devcontainer-cli.sh
 
-docker_sock=
-if [ -e /var/run/docker-host.sock ]; then
-    docker_sock=$(readlink -f /var/run/docker-host.sock)
-else
-    docker_sock=$(readlink -f /var/run/docker.sock)
+DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS /var/run/docker.sock)
+# Make this work inside a devcontainer as well.
+if [ -w /var/run/docker-host.sock ]; then
+    DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS /var/run/docker-host.sock)
 fi
-DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS "$docker_sock")
-
 
 # Build the devcontainer image.
 rootdir="$repo_root"
diff --git a/.devcontainer/scripts/run-devcontainer.sh b/.devcontainer/scripts/run-devcontainer.sh
index 0a8ec775a5..9b406ba15f 100755
--- a/.devcontainer/scripts/run-devcontainer.sh
+++ b/.devcontainer/scripts/run-devcontainer.sh
@@ -24,13 +24,11 @@ container_name="$repo_name.$(stat $STAT_FORMAT_INODE_ARGS "$repo_root/")"
 # Be sure to use the host workspace folder if available.
 workspace_root=${LOCAL_WORKSPACE_FOLDER:-$repo_root}
 
-docker_sock=
 if [ -e /var/run/docker-host.sock ]; then
-    docker_sock=$(readlink -f /var/run/docker-host.sock)
+    docker_gid=$(stat $STAT_FORMAT_GID_ARGS /var/run/docker-host.sock)
 else
-    docker_sock=$(readlink -f /var/run/docker.sock)
+    docker_gid=$(stat $STAT_FORMAT_GID_ARGS /var/run/docker.sock)
 fi
-DOCKER_GID=$(stat $STAT_FORMAT_GID_ARGS "$docker_sock")
 
 set -x
 mkdir -p "/tmp/$container_name/dc/shellhistory"
@@ -38,7 +36,7 @@ docker run -it --rm \
     --name "$container_name" \
     --user vscode \
     --env USER=vscode \
-    --group-add $DOCKER_GID \
+    --group-add $docker_gid \
     -v "$HOME/.azure":/dc/azure \
     -v "/tmp/$container_name/dc/shellhistory:/dc/shellhistory" \
     -v /var/run/docker.sock:/var/run/docker.sock \