vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #280 from resouer/minor-fix

Browse source 
Refactoring minor fix
This commit is contained in:
Kenfe-Mickaël Laventure 2016-07-05 11:27:18 -07:00 • committed by GitHub
commit ef23e7041b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
containerd-shim/process.go
View file

@ -338,7 +338,7 @@ func (p *process) initializeIO(rootuid int) (i *IO, err error) {
} }
fds = append(fds, r.Fd(), w.Fd()) fds = append(fds, r.Fd(), w.Fd())
p.stdio.stderr, i.Stderr = w, r p.stdio.stderr, i.Stderr = w, r
// change ownership of the pipes incase we are in a user namespace // change ownership of the pipes in case we are in a user namespace
for _, fd := range fds { for _, fd := range fds {
if err := syscall.Fchown(int(fd), rootuid, rootuid); err != nil { if err := syscall.Fchown(int(fd), rootuid, rootuid); err != nil {
return nil, err return nil, err

2
docs/attach.md
View file

@ -25,7 +25,7 @@ message CreateContainerRequest {
## Attach ## Attach
In order to have attach like functionality for your containers you use the same API request but named pipes or `fifo`s can be used to achieve this type of functionality. In order to have attach like functionality for your containers you use the same API request but named pipes or fifos can be used to achieve this type of functionality.
The default CLI for containerd does this if you specify the `--attach` flag on `create` or `start`. The default CLI for containerd does this if you specify the `--attach` flag on `create` or `start`.
It will create fifos for each of the containers stdio which the CLI can read and write to. It will create fifos for each of the containers stdio which the CLI can read and write to.
This can be used to create an interactive session with the container, `bash` for example, or to have a blocking way to collect the container's STDIO and forward it to your logging facilities. This can be used to create an interactive session with the container, `bash` for example, or to have a blocking way to collect the container's STDIO and forward it to your logging facilities.

2
docs/bundle-changes.md
View file

@ -9,4 +9,4 @@ A user can also populate this directory and provide the checkpoint name on the c
As of this point, containerd has no other additions to the bundle. As of this point, containerd has no other additions to the bundle.
Runtime state is currently stored in a tmp filesystem like `/run`. Runtime state is currently stored in a tmpfs filesystem like `/run`.