From 11550c60639af2af1e8cb2e76e27510722421863 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Tue, 28 May 2013 21:38:35 -0700 Subject: [PATCH 1/4] Removed debug output in 'docker version' --- commands.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/commands.go b/commands.go index 2af7e548fc..1e7dd0632c 100644 --- a/commands.go +++ b/commands.go @@ -366,12 +366,10 @@ func (cli *DockerCli) CmdWait(args ...string) error { // 'docker version': show version information func (cli *DockerCli) CmdVersion(args ...string) error { cmd := Subcmd("version", "", "Show the docker version information.") - fmt.Println(len(args)) if err := cmd.Parse(args); err != nil { return nil } - fmt.Println(cmd.NArg()) if cmd.NArg() > 0 { cmd.Usage() return nil From b2084a9c599d91fa1460116ef0c8d509d3353103 Mon Sep 17 00:00:00 2001 From: Renato Riccieri Santos Zannon Date: Thu, 30 May 2013 01:56:08 -0300 Subject: [PATCH 2/4] Add IP forwarding config to archlinux guide I had this small issue when following this guide on my Arch box, and I don't think it is specific to any configuration I have. --- docs/sources/installation/archlinux.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/sources/installation/archlinux.rst b/docs/sources/installation/archlinux.rst index 9e3766eb26..722c150194 100644 --- a/docs/sources/installation/archlinux.rst +++ b/docs/sources/installation/archlinux.rst @@ -67,3 +67,21 @@ To start on system boot: :: sudo systemctl enable docker + +Network Configuration +--------------------- + +IPv4 packet forwarding is disabled by default on Arch, so internet access from inside +the container may not work. + +To enable the forwarding, run as root on the host system: + +:: + + sysctl net.ipv4.ip_forward=1 + +And, to make it persistent across reboots, enable it on the host's **/etc/sysctl.conf**: + +:: + + net.ipv4.ip_forward=1 From 2c14d3949dcad3a98980929e0cb2d2326db7d8fe Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 30 May 2013 14:08:26 +0000 Subject: [PATCH 3/4] always display help in the same order --- commands.go | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/commands.go b/commands.go index 97a249e54a..3ce5708aa1 100644 --- a/commands.go +++ b/commands.go @@ -73,37 +73,37 @@ func (cli *DockerCli) CmdHelp(args ...string) error { } } help := fmt.Sprintf("Usage: docker [OPTIONS] COMMAND [arg...]\n -H=\"%s:%d\": Host:port to bind/connect to\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n", cli.host, cli.port) - for cmd, description := range map[string]string{ - "attach": "Attach to a running container", - "build": "Build a container from a Dockerfile", - "commit": "Create a new image from a container's changes", - "diff": "Inspect changes on a container's filesystem", - "export": "Stream the contents of a container as a tar archive", - "history": "Show the history of an image", - "images": "List images", - "import": "Create a new filesystem image from the contents of a tarball", - "info": "Display system-wide information", - "insert": "Insert a file in an image", - "inspect": "Return low-level information on a container", - "kill": "Kill a running container", - "login": "Register or Login to the docker registry server", - "logs": "Fetch the logs of a container", - "port": "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT", - "ps": "List containers", - "pull": "Pull an image or a repository from the docker registry server", - "push": "Push an image or a repository to the docker registry server", - "restart": "Restart a running container", - "rm": "Remove a container", - "rmi": "Remove an image", - "run": "Run a command in a new container", - "search": "Search for an image in the docker index", - "start": "Start a stopped container", - "stop": "Stop a running container", - "tag": "Tag an image into a repository", - "version": "Show the docker version information", - "wait": "Block until a container stops, then print its exit code", + for _, command := range [][2]string{ + {"attach", "Attach to a running container"}, + {"build", "Build a container from a Dockerfile"}, + {"commit", "Create a new image from a container's changes"}, + {"diff", "Inspect changes on a container's filesystem"}, + {"export", "Stream the contents of a container as a tar archive"}, + {"history", "Show the history of an image"}, + {"images", "List images"}, + {"import", "Create a new filesystem image from the contents of a tarball"}, + {"info", "Display system-wide information"}, + {"insert", "Insert a file in an image"}, + {"inspect", "Return low-level information on a container"}, + {"kill", "Kill a running container"}, + {"login", "Register or Login to the docker registry server"}, + {"logs", "Fetch the logs of a container"}, + {"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"}, + {"ps", "List containers"}, + {"pull", "Pull an image or a repository from the docker registry server"}, + {"push", "Push an image or a repository to the docker registry server"}, + {"restart", "Restart a running container"}, + {"rm", "Remove a container"}, + {"rmi", "Remove an image"}, + {"run", "Run a command in a new container"}, + {"search", "Search for an image in the docker index"}, + {"start", "Start a stopped container"}, + {"stop", "Stop a running container"}, + {"tag", "Tag an image into a repository"}, + {"version", "Show the docker version information"}, + {"wait", "Block until a container stops}, then print its exit code"}, } { - help += fmt.Sprintf(" %-10.10s%s\n", cmd, description) + help += fmt.Sprintf(" %-10.10s%s\n", command[0], command[1]) } fmt.Println(help) return nil From 2ed1092dad9d2dec30945b06572befbba003ed1d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 30 May 2013 11:26:47 -0700 Subject: [PATCH 4/4] * Documentation: removed 'building blocks' for now. --- docs/sources/concepts/buildingblocks.rst | 25 ------------------------ docs/sources/concepts/index.rst | 1 - 2 files changed, 26 deletions(-) delete mode 100644 docs/sources/concepts/buildingblocks.rst diff --git a/docs/sources/concepts/buildingblocks.rst b/docs/sources/concepts/buildingblocks.rst deleted file mode 100644 index 5f752ea47b..0000000000 --- a/docs/sources/concepts/buildingblocks.rst +++ /dev/null @@ -1,25 +0,0 @@ -:title: Building Blocks -:description: An introduction to docker and standard containers? -:keywords: containers, lxc, concepts, explanation - - -Building blocks -=============== - -.. _images: - -Images ------- -An original container image. These are stored on disk and are comparable with what you normally expect from a stopped virtual machine image. Images are stored (and retrieved from) repository - -Images are stored on your local file system under /var/lib/docker/graph - - -.. _containers: - -Containers ----------- -A container is a local version of an image. It can be running or stopped, The equivalent would be a virtual machine instance. - -Containers are stored on your local file system under /var/lib/docker/containers - diff --git a/docs/sources/concepts/index.rst b/docs/sources/concepts/index.rst index ba1f9f4718..8b02d15d33 100644 --- a/docs/sources/concepts/index.rst +++ b/docs/sources/concepts/index.rst @@ -13,5 +13,4 @@ Contents: :maxdepth: 1 ../index - buildingblocks