toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added: info, history, logs, ps, start, stop, restart, rm, rmi

Browse Source 
Upstream-commit: b295239de20f15620ee4149fcc7c13ce461cdaac
Component: engine
This commit is contained in:
Victor Vieux
2013-04-19 15:24:37 +02:00
parent 68a1f0bf2e
commit da599fd557
5 changed files with 714 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/container.go
View File

@ -3,7 +3,6 @@ package docker
import (
"encoding/json"
"fmt"
"github.com/dotcloud/docker/rcli"
"github.com/kr/pty"
"io"
"io/ioutil"
@ -66,8 +65,8 @@ type Config struct {
Image string // Name of the image as it was passed by the operator (eg. could be symbolic)
}
func ParseRun(args []string, stdout io.Writer) (*Config, error) {
cmd := rcli.Subcmd(stdout, "run", "[OPTIONS] IMAGE COMMAND [ARG...]", "Run a command in a new container")
func ParseRun(args []string) (*Config, error) {
cmd := Subcmd("run", "[OPTIONS] IMAGE COMMAND [ARG...]", "Run a command in a new container")
if len(args) > 0 && args[0] != "--help" {
cmd.SetOutput(ioutil.Discard)
}
@ -82,7 +81,7 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
flMemory := cmd.Int64("m", 0, "Memory limit (in bytes)")
if *flMemory > 0 && NO_MEMORY_LIMIT {
fmt.Fprintf(stdout, "WARNING: This version of docker has been compiled without memory limit support. Discarding -m.")
fmt.Println("WARNING: This version of docker has been compiled without memory limit support. Discarding -m.")
*flMemory = 0
}