Revert "wip: fix docker socket perms"

This reverts commit 2d88dfb.
microsoft · Oct 18, 2024 · 1397ee1 · 1397ee1
1 parent 5fe9927
commit 1397ee1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git 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
@@ -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
@@ -24,21 +24,19 @@ 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"
 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 \