docker{,-rootful}.yaml: remove /var/run/docker.sock on installing r…

…ootless Signed-off-by: Norio Nomura <[email protected]>
lima-vm · Jul 23, 2024 · 4a2f79c · 4a2f79c
1 parent 4a18e6e
commit 4a2f79c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/docker-rootful.yaml b/examples/docker-rootful.yaml
@@ -75,10 +75,11 @@ provision:
       readonly systemctl="systemctl --user"
       readonly tee="tee"
 
-      sudo systemctl disable --now docker.socket docker
+      sudo systemctl disable --now docker
       if [ "$rootless_installed" != "true" ]; then
         sudo apt-get install -y dbus-user-session fuse3 uidmap
         $systemctl start dbus
+        [ ! -S /var/run/docker.sock ] || sudo rm /var/run/docker.sock
         dockerd-rootless-setuptool.sh install
       fi
       docker context use rootless

diff --git a/examples/docker.yaml b/examples/docker.yaml
@@ -75,10 +75,11 @@ provision:
       readonly systemctl="systemctl --user"
       readonly tee="tee"
 
-      sudo systemctl disable --now docker.socket docker
+      sudo systemctl disable --now docker
       if [ "$rootless_installed" != "true" ]; then
         sudo apt-get install -y dbus-user-session fuse3 uidmap
         $systemctl start dbus
+        [ ! -S /var/run/docker.sock ] || sudo rm /var/run/docker.sock
         dockerd-rootless-setuptool.sh install
       fi
       docker context use rootless