diff --git a/commands.go b/commands.go index 65ae50e4c7..c08c20b861 100644 --- a/commands.go +++ b/commands.go @@ -949,7 +949,7 @@ func CmdAttach(args ...string) error { return nil } - body, _, err := call("GET", "/containers/"+cmd.Arg(0), nil) + body, _, err := call("GET", "/containers/"+cmd.Arg(0)+"/json", nil) if err != nil { return err } @@ -961,7 +961,6 @@ func CmdAttach(args ...string) error { } v := url.Values{} - v.Set("logs", "1") v.Set("stream", "1") v.Set("stdout", "1") v.Set("stderr", "1") diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst deleted file mode 100644 index 47ecb79e67..0000000000 --- a/docs/sources/commandline/cli.rst +++ /dev/null @@ -1,55 +0,0 @@ -:title: Command Line Interface -:description: Docker's CLI command description and usage -:keywords: Docker, Docker documentation, CLI, command line - -.. _cli: - -Command Line Interface -====================== - -Docker Usage -~~~~~~~~~~~~ - -To list available commands, either run ``docker`` with no parameters or execute -``docker help``:: - - $ docker - Usage: docker COMMAND [arg...] - - A self-sufficient runtime for linux containers. - - ... - -Available Commands -~~~~~~~~~~~~~~~~~~ - -.. toctree:: - :maxdepth: 1 - - command/attach - command/build - command/commit - command/diff - command/export - command/history - command/images - command/import - command/info - command/inspect - command/kill - command/login - command/logs - command/port - command/ps - command/pull - command/push - command/restart - command/rm - command/rmi - command/run - command/search - command/start - command/stop - command/tag - command/version - command/wait diff --git a/docs/sources/commandline/command/attach.rst b/docs/sources/commandline/command/attach.rst deleted file mode 100644 index ac9a84c0cf..0000000000 --- a/docs/sources/commandline/command/attach.rst +++ /dev/null @@ -1,9 +0,0 @@ -=========================================== -``attach`` -- Attach to a running container -=========================================== - -:: - - Usage: docker attach CONTAINER - - Attach to a running container diff --git a/docs/sources/commandline/command/build.rst b/docs/sources/commandline/command/build.rst deleted file mode 100644 index 6415f11f7b..0000000000 --- a/docs/sources/commandline/command/build.rst +++ /dev/null @@ -1,9 +0,0 @@ -=========================================== -``build`` -- Build a container from Dockerfile via stdin -=========================================== - -:: - - Usage: docker build - - Example: cat Dockerfile | docker build - - Build a new image from the Dockerfile passed via stdin diff --git a/docs/sources/commandline/command/commit.rst b/docs/sources/commandline/command/commit.rst deleted file mode 100644 index c73f8d1898..0000000000 --- a/docs/sources/commandline/command/commit.rst +++ /dev/null @@ -1,27 +0,0 @@ -=========================================================== -``commit`` -- Create a new image from a container's changes -=========================================================== - -:: - - Usage: docker commit [OPTIONS] CONTAINER [REPOSITORY [TAG]] - - Create a new image from a container's changes - - -m="": Commit message - -author="": Author (eg. "John Hannibal Smith " - -run="": Config automatically applied when the image is run. "+`(ex: {"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}') - -Full -run example:: - - {"Hostname": "", - "User": "", - "Memory": 0, - "MemorySwap": 0, - "PortSpecs": ["22", "80", "443"], - "Tty": true, - "OpenStdin": true, - "StdinOnce": true, - "Env": ["FOO=BAR", "FOO2=BAR2"], - "Cmd": ["cat", "-e", "/etc/resolv.conf"], - "Dns": ["8.8.8.8", "8.8.4.4"]} diff --git a/docs/sources/commandline/command/diff.rst b/docs/sources/commandline/command/diff.rst deleted file mode 100644 index 301da6c499..0000000000 --- a/docs/sources/commandline/command/diff.rst +++ /dev/null @@ -1,9 +0,0 @@ -======================================================= -``diff`` -- Inspect changes on a container's filesystem -======================================================= - -:: - - Usage: docker diff CONTAINER [OPTIONS] - - Inspect changes on a container's filesystem diff --git a/docs/sources/commandline/command/export.rst b/docs/sources/commandline/command/export.rst deleted file mode 100644 index 88ecd2fd53..0000000000 --- a/docs/sources/commandline/command/export.rst +++ /dev/null @@ -1,9 +0,0 @@ -================================================================= -``export`` -- Stream the contents of a container as a tar archive -================================================================= - -:: - - Usage: docker export CONTAINER - - Export the contents of a filesystem as a tar archive diff --git a/docs/sources/commandline/command/history.rst b/docs/sources/commandline/command/history.rst deleted file mode 100644 index 92fad3b487..0000000000 --- a/docs/sources/commandline/command/history.rst +++ /dev/null @@ -1,9 +0,0 @@ -=========================================== -``history`` -- Show the history of an image -=========================================== - -:: - - Usage: docker history [OPTIONS] IMAGE - - Show the history of an image diff --git a/docs/sources/commandline/command/images.rst b/docs/sources/commandline/command/images.rst deleted file mode 100644 index 5bcfe817f4..0000000000 --- a/docs/sources/commandline/command/images.rst +++ /dev/null @@ -1,22 +0,0 @@ -========================= -``images`` -- List images -========================= - -:: - - Usage: docker images [OPTIONS] [NAME] - - List images - - -a=false: show all images - -q=false: only show numeric IDs - -viz=false: output in graphviz format - -Displaying images visually --------------------------- - -:: - - docker images -viz | dot -Tpng -o docker.png - -.. image:: images/docker_images.gif diff --git a/docs/sources/commandline/command/images/docker_images.gif b/docs/sources/commandline/command/images/docker_images.gif deleted file mode 100644 index 5894ca270e..0000000000 Binary files a/docs/sources/commandline/command/images/docker_images.gif and /dev/null differ diff --git a/docs/sources/commandline/command/import.rst b/docs/sources/commandline/command/import.rst deleted file mode 100644 index 5fe90764b9..0000000000 --- a/docs/sources/commandline/command/import.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================================================================== -``import`` -- Create a new filesystem image from the contents of a tarball -========================================================================== - -:: - - Usage: docker import [OPTIONS] URL|- [REPOSITORY [TAG]] - - Create a new filesystem image from the contents of a tarball diff --git a/docs/sources/commandline/command/info.rst b/docs/sources/commandline/command/info.rst deleted file mode 100644 index 10697dba18..0000000000 --- a/docs/sources/commandline/command/info.rst +++ /dev/null @@ -1,9 +0,0 @@ -=========================================== -``info`` -- Display system-wide information -=========================================== - -:: - - Usage: docker info - - Display system-wide information. diff --git a/docs/sources/commandline/command/inspect.rst b/docs/sources/commandline/command/inspect.rst deleted file mode 100644 index 34365d1f26..0000000000 --- a/docs/sources/commandline/command/inspect.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================================================== -``inspect`` -- Return low-level information on a container -========================================================== - -:: - - Usage: docker inspect [OPTIONS] CONTAINER - - Return low-level information on a container diff --git a/docs/sources/commandline/command/kill.rst b/docs/sources/commandline/command/kill.rst deleted file mode 100644 index cbd019e1a9..0000000000 --- a/docs/sources/commandline/command/kill.rst +++ /dev/null @@ -1,9 +0,0 @@ -==================================== -``kill`` -- Kill a running container -==================================== - -:: - - Usage: docker kill [OPTIONS] CONTAINER [CONTAINER...] - - Kill a running container diff --git a/docs/sources/commandline/command/login.rst b/docs/sources/commandline/command/login.rst deleted file mode 100644 index b064b40145..0000000000 --- a/docs/sources/commandline/command/login.rst +++ /dev/null @@ -1,9 +0,0 @@ -============================================================ -``login`` -- Register or Login to the docker registry server -============================================================ - -:: - - Usage: docker login - - Register or Login to the docker registry server diff --git a/docs/sources/commandline/command/logs.rst b/docs/sources/commandline/command/logs.rst deleted file mode 100644 index 87f3f95b65..0000000000 --- a/docs/sources/commandline/command/logs.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================================= -``logs`` -- Fetch the logs of a container -========================================= - -:: - - Usage: docker logs [OPTIONS] CONTAINER - - Fetch the logs of a container diff --git a/docs/sources/commandline/command/port.rst b/docs/sources/commandline/command/port.rst deleted file mode 100644 index 4fb6d7f812..0000000000 --- a/docs/sources/commandline/command/port.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================================================================= -``port`` -- Lookup the public-facing port which is NAT-ed to PRIVATE_PORT -========================================================================= - -:: - - Usage: docker port [OPTIONS] CONTAINER PRIVATE_PORT - - Lookup the public-facing port which is NAT-ed to PRIVATE_PORT diff --git a/docs/sources/commandline/command/ps.rst b/docs/sources/commandline/command/ps.rst deleted file mode 100644 index f73177918b..0000000000 --- a/docs/sources/commandline/command/ps.rst +++ /dev/null @@ -1,13 +0,0 @@ -========================= -``ps`` -- List containers -========================= - -:: - - Usage: docker ps [OPTIONS] - - List containers - - -a=false: Show all containers. Only running containers are shown by default. - -notrunc=false: Don't truncate output - -q=false: Only display numeric IDs diff --git a/docs/sources/commandline/command/pull.rst b/docs/sources/commandline/command/pull.rst deleted file mode 100644 index 1c417ddcde..0000000000 --- a/docs/sources/commandline/command/pull.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================================================================= -``pull`` -- Pull an image or a repository from the docker registry server -========================================================================= - -:: - - Usage: docker pull NAME - - Pull an image or a repository from the registry diff --git a/docs/sources/commandline/command/push.rst b/docs/sources/commandline/command/push.rst deleted file mode 100644 index a42296c715..0000000000 --- a/docs/sources/commandline/command/push.rst +++ /dev/null @@ -1,9 +0,0 @@ -======================================================================= -``push`` -- Push an image or a repository to the docker registry server -======================================================================= - -:: - - Usage: docker push NAME - - Push an image or a repository to the registry diff --git a/docs/sources/commandline/command/restart.rst b/docs/sources/commandline/command/restart.rst deleted file mode 100644 index 24bba5a5a9..0000000000 --- a/docs/sources/commandline/command/restart.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================================== -``restart`` -- Restart a running container -========================================== - -:: - - Usage: docker restart [OPTIONS] NAME - - Restart a running container diff --git a/docs/sources/commandline/command/rm.rst b/docs/sources/commandline/command/rm.rst deleted file mode 100644 index f6d6893bfb..0000000000 --- a/docs/sources/commandline/command/rm.rst +++ /dev/null @@ -1,9 +0,0 @@ -============================ -``rm`` -- Remove a container -============================ - -:: - - Usage: docker rm [OPTIONS] CONTAINER - - Remove a container diff --git a/docs/sources/commandline/command/rmi.rst b/docs/sources/commandline/command/rmi.rst deleted file mode 100644 index 3761196f23..0000000000 --- a/docs/sources/commandline/command/rmi.rst +++ /dev/null @@ -1,9 +0,0 @@ -========================== -``rmi`` -- Remove an image -========================== - -:: - - Usage: docker rmimage [OPTIONS] IMAGE - - Remove an image diff --git a/docs/sources/commandline/command/run.rst b/docs/sources/commandline/command/run.rst deleted file mode 100644 index d5e571b41b..0000000000 --- a/docs/sources/commandline/command/run.rst +++ /dev/null @@ -1,22 +0,0 @@ -=========================================== -``run`` -- Run a command in a new container -=========================================== - -:: - - Usage: docker run [OPTIONS] IMAGE COMMAND [ARG...] - - Run a command in a new container - - -a=map[]: Attach to stdin, stdout or stderr. - -d=false: Detached mode: leave the container running in the background - -e=[]: Set environment variables - -h="": Container host name - -i=false: Keep stdin open even if not attached - -m=0: Memory limit (in bytes) - -p=[]: Map a network port to the container - -t=false: Allocate a pseudo-tty - -u="": Username or UID - -d=[]: Set custom dns servers for the container - -v=[]: Creates a new volumes and mount it at the specified path. - -volumes-from="": Mount all volumes from the given container. diff --git a/docs/sources/commandline/command/search.rst b/docs/sources/commandline/command/search.rst deleted file mode 100644 index 0af24dfaf5..0000000000 --- a/docs/sources/commandline/command/search.rst +++ /dev/null @@ -1,10 +0,0 @@ -=================================================================== -``search`` -- Search for an image in the docker index -=================================================================== - -:: - - Usage: docker search TERM - - Searches for the TERM parameter on the Docker index and prints out a list of repositories - that match. diff --git a/docs/sources/commandline/command/start.rst b/docs/sources/commandline/command/start.rst deleted file mode 100644 index df415ca3d3..0000000000 --- a/docs/sources/commandline/command/start.rst +++ /dev/null @@ -1,9 +0,0 @@ -====================================== -``start`` -- Start a stopped container -====================================== - -:: - - Usage: docker start [OPTIONS] NAME - - Start a stopped container diff --git a/docs/sources/commandline/command/stop.rst b/docs/sources/commandline/command/stop.rst deleted file mode 100644 index df6d66ccf9..0000000000 --- a/docs/sources/commandline/command/stop.rst +++ /dev/null @@ -1,9 +0,0 @@ -==================================== -``stop`` -- Stop a running container -==================================== - -:: - - Usage: docker stop [OPTIONS] NAME - - Stop a running container diff --git a/docs/sources/commandline/command/tag.rst b/docs/sources/commandline/command/tag.rst deleted file mode 100644 index 59647355e9..0000000000 --- a/docs/sources/commandline/command/tag.rst +++ /dev/null @@ -1,11 +0,0 @@ -========================================= -``tag`` -- Tag an image into a repository -========================================= - -:: - - Usage: docker tag [OPTIONS] IMAGE REPOSITORY [TAG] - - Tag an image into a repository - - -f=false: Force diff --git a/docs/sources/commandline/command/version.rst b/docs/sources/commandline/command/version.rst deleted file mode 100644 index eedf02f2d0..0000000000 --- a/docs/sources/commandline/command/version.rst +++ /dev/null @@ -1,3 +0,0 @@ -================================================== -``version`` -- Show the docker version information -================================================== diff --git a/docs/sources/commandline/command/wait.rst b/docs/sources/commandline/command/wait.rst deleted file mode 100644 index 2959bf880b..0000000000 --- a/docs/sources/commandline/command/wait.rst +++ /dev/null @@ -1,9 +0,0 @@ -=================================================================== -``wait`` -- Block until a container stops, then print its exit code -=================================================================== - -:: - - Usage: docker wait [OPTIONS] NAME - - Block until a container stops, then print its exit code. diff --git a/docs/sources/commandline/index.rst b/docs/sources/commandline/index.rst index d19d39ab60..e6897a747a 100644 --- a/docs/sources/commandline/index.rst +++ b/docs/sources/commandline/index.rst @@ -9,8 +9,7 @@ Commands Contents: .. toctree:: - :maxdepth: 3 + :maxdepth: 2 basics workingwithrepository - cli \ No newline at end of file