Skip to content

Commit 2d7d995

Browse files
committed
docker{,-rootful}.yaml: remove /var/run/docker.sock on installing rootless
Signed-off-by: Norio Nomura <[email protected]>
1 parent b84e93e commit 2d7d995

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: examples/docker-rootful.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ provision:
7575
readonly systemctl="systemctl --user"
7676
readonly tee="tee"
7777
78-
sudo systemctl disable --now docker.socket docker
78+
sudo systemctl disable --now docker
7979
if [ "$rootless_installed" != "true" ]; then
8080
sudo apt-get install -y dbus-user-session fuse3 uidmap
8181
$systemctl start dbus
82+
[ ! -S /var/run/docker.sock ] || sudo rm /var/run/docker.sock
8283
dockerd-rootless-setuptool.sh install
8384
fi
8485
docker context use rootless

Diff for: examples/docker.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ provision:
7575
readonly systemctl="systemctl --user"
7676
readonly tee="tee"
7777
78-
sudo systemctl disable --now docker.socket docker
78+
sudo systemctl disable --now docker
7979
if [ "$rootless_installed" != "true" ]; then
8080
sudo apt-get install -y dbus-user-session fuse3 uidmap
8181
$systemctl start dbus
82+
[ ! -S /var/run/docker.sock ] || sudo rm /var/run/docker.sock
8283
dockerd-rootless-setuptool.sh install
8384
fi
8485
docker context use rootless

0 commit comments

Comments
 (0)