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

Update runc in dockerfile for new commands

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-04-26 15:01:24 -07:00
parent 9ed8422e8c
commit db789045bd
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -36,7 +36,7 @@ RUN set -x \
&& rm -rf "$SECCOMP_PATH" && rm -rf "$SECCOMP_PATH"
# Install runc # Install runc
ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 ENV RUNC_COMMIT 9c89737e6e117a8be5a4980bc9795fe1a2b1028e
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \

8
runtime/container.go
View file

@ -521,7 +521,9 @@ func hostIDFromMap(id uint32, mp []ocs.IDMapping) int {
} }
func (c *container) Pids() ([]int, error) { func (c *container) Pids() ([]int, error) {
out, err := exec.Command(c.runtime, "ps", "--format=json", c.id).CombinedOutput() args := c.runtimeArgs
args = append(args, "ps", "--format=json", c.id)
out, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return nil, fmt.Errorf("%s", out) return nil, fmt.Errorf("%s", out)
} }
@ -534,7 +536,9 @@ func (c *container) Pids() ([]int, error) {
func (c *container) Stats() (*Stat, error) { func (c *container) Stats() (*Stat, error) {
now := time.Now() now := time.Now()
out, err := exec.Command(c.runtime, "events", "--stats", c.id).CombinedOutput() args := c.runtimeArgs
args = append(args, "events", "--stats", c.id)
out, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil { if err != nil {
return nil, fmt.Errorf("%s", out) return nil, fmt.Errorf("%s", out)
} }