mirror of
https://github.com/rancher/os.git
synced 2025-08-12 12:02:22 +00:00
fix user-docker
This commit is contained in:
parent
f072cff37c
commit
1b327e8d7f
@ -110,6 +110,8 @@ func execute(line string, wg *sync.WaitGroup) {
|
|||||||
args := strings.Split(line, " ")
|
args := strings.Split(line, " ")
|
||||||
|
|
||||||
cmd := exec.Command("setsid", args...)
|
cmd := exec.Command("setsid", args...)
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
|
||||||
err := cmd.Start()
|
err := cmd.Start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
rancher:
|
rancher:
|
||||||
bootstrap:
|
bootstrap:
|
||||||
udev:
|
udev-bootstrap:
|
||||||
image: rancher/os-udev:v0.4.0-dev
|
image: rancher/os-udev:v0.4.0-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: false
|
io.rancher.os.detach: false
|
||||||
@ -22,7 +22,7 @@ rancher:
|
|||||||
log_driver: json-file
|
log_driver: json-file
|
||||||
net: none
|
net: none
|
||||||
privileged: true
|
privileged: true
|
||||||
udev:
|
udev-autoformat:
|
||||||
image: rancher/os-udev:v0.4.0-dev
|
image: rancher/os-udev:v0.4.0-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: false
|
io.rancher.os.detach: false
|
||||||
@ -131,7 +131,7 @@ rancher:
|
|||||||
- /usr/bin/ros:/usr/bin/respawn:ro
|
- /usr/bin/ros:/usr/bin/respawn:ro
|
||||||
- /usr/bin/ros:/usr/bin/system-docker:ro
|
- /usr/bin/ros:/usr/bin/system-docker:ro
|
||||||
- /usr/bin/ros:/usr/sbin/wait-for-docker:ro
|
- /usr/bin/ros:/usr/sbin/wait-for-docker:ro
|
||||||
- /usr/bin/ros:/usr/sbin/dockerlaunch:ro
|
- /usr/bin/ros:/usr/bin/dockerlaunch:ro
|
||||||
- /usr/bin/docker:/usr/bin/docker:ro
|
- /usr/bin/docker:/usr/bin/docker:ro
|
||||||
console:
|
console:
|
||||||
image: rancher/os-console:v0.4.0-dev
|
image: rancher/os-console:v0.4.0-dev
|
||||||
@ -146,19 +146,6 @@ rancher:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes_from:
|
volumes_from:
|
||||||
- all-volumes
|
- all-volumes
|
||||||
docker:
|
|
||||||
image: rancher/os-docker:v0.4.0-dev
|
|
||||||
labels:
|
|
||||||
io.rancher.os.scope: system
|
|
||||||
io.rancher.os.after: network
|
|
||||||
net: host
|
|
||||||
uts: host
|
|
||||||
pid: host
|
|
||||||
ipc: host
|
|
||||||
privileged: true
|
|
||||||
restart: always
|
|
||||||
volumes_from:
|
|
||||||
- all-volumes
|
|
||||||
docker-volumes:
|
docker-volumes:
|
||||||
image: rancher/os-state:v0.4.0-dev
|
image: rancher/os-state:v0.4.0-dev
|
||||||
labels:
|
labels:
|
||||||
@ -208,6 +195,8 @@ rancher:
|
|||||||
image: rancher/os-preload:v0.4.0-dev
|
image: rancher/os-preload:v0.4.0-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: false
|
io.rancher.os.detach: false
|
||||||
|
io.rancher.os.scope: system
|
||||||
|
io.rancher.os.after: console
|
||||||
privileged: true
|
privileged: true
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
Loading…
Reference in New Issue
Block a user