rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 15:24:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1838 from SvenDowideit/remove-user-docker-link

Browse Source 
Remove the user-docker link, its redundant
This commit is contained in:
Sven Dowideit
2017-05-09 17:52:36 +10:00
committed by GitHub
parent 923e4629a5 e7ff8e65e9
commit cf89c124a4
3 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/control/selinux.go
View File

@@ -17,7 +17,6 @@ func selinuxCommand() cli.Command {
"--net", "host", "--pid", "host", "--ipc", "host", "--net", "host", "--pid", "host", "--ipc", "host",
"-v", "/usr/bin/docker:/usr/bin/docker.dist:ro", "-v", "/usr/bin/docker:/usr/bin/docker.dist:ro",
"-v", "/usr/bin/ros:/usr/bin/dockerlaunch:ro", "-v", "/usr/bin/ros:/usr/bin/dockerlaunch:ro",
"-v", "/usr/bin/ros:/usr/bin/user-docker:ro",
"-v", "/usr/bin/ros:/usr/bin/system-docker:ro", "-v", "/usr/bin/ros:/usr/bin/system-docker:ro",
"-v", "/usr/bin/ros:/sbin/poweroff:ro", "-v", "/usr/bin/ros:/sbin/poweroff:ro",
"-v", "/usr/bin/ros:/sbin/reboot:ro", "-v", "/usr/bin/ros:/sbin/reboot:ro",

1
cmd/control/user_docker.go
View File

@@ -25,7 +25,6 @@ import (
const ( const (
defaultStorageContext = "console" defaultStorageContext = "console"
dockerPidFile = "/var/run/docker.pid" dockerPidFile = "/var/run/docker.pid"
userDocker = "user-docker"
sourceDirectory = "/engine" sourceDirectory = "/engine"
destDirectory = "/var/lib/rancher/engine" destDirectory = "/var/lib/rancher/engine"
) )

1
docs/os/system-services/system-docker-volumes/index.md
View File

@@ -36,7 +36,6 @@ Provides necessary command binaries (read-only), used by system services:
/usr/bin/docker-runc.dist /usr/bin/docker-runc.dist
/usr/bin/docker.dist /usr/bin/docker.dist
/usr/bin/dockerlaunch /usr/bin/dockerlaunch
/usr/bin/user-docker
/usr/bin/system-docker /usr/bin/system-docker
/sbin/poweroff /sbin/poweroff
/sbin/reboot /sbin/reboot