Fix docs for #14047

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-06-25 09:55:46 -07:00 committed by Tibor Vass
parent a5791e2541
commit c2049a1703
2 changed files with 45 additions and 13 deletions

View File

@ -15,17 +15,22 @@ weight=1
Show the Docker version information. Show the Docker version information.
Show the Docker version, API version, Git commit, Go version and Show the Docker version, API version, Go version, Git commit, Build date/time,
OS/architecture of both Docker client and daemon. Example use: and OS/architecture of both Docker client and daemon. Example use:
$ docker version $ docker version
Client version: 1.5.0 Client:
Client API version: 1.17 Version: 1.8.0
Go version (client): go1.4.1 API version: 1.20
Git commit (client): a8a31ef Go version: go1.4.2
OS/Arch (client): darwin/amd64 Git commit: f5bae0a
Server version: 1.5.0 Built: Tue Jun 23 17:56:00 UTC 2015
Server API version: 1.17 OS/Arch: linux/amd64
Go version (server): go1.4.1
Git commit (server): a8a31ef Server:
OS/Arch (server): linux/amd64 Version: 1.8.0
API version: 1.20
Go version: go1.4.2
Git commit: f5bae0a
Built: Tue Jun 23 17:56:00 UTC 2015
OS/Arch: linux/amd64

View File

@ -1,15 +1,42 @@
% DOCKER(1) Docker User Manuals % DOCKER(1) Docker User Manuals
% Docker Community % Docker Community
% JUNE 2014 % JUNE 2015
# NAME # NAME
docker-version - Show the Docker version information. docker-version - Show the Docker version information.
# SYNOPSIS # SYNOPSIS
**docker version** **docker version**
# DESCRIPTION
This command displays version information for both the Docker client and
daemon.
# OPTIONS # OPTIONS
There are no available options. There are no available options.
# EXAMPLES
## Display Docker version information
Here is a sample output:
$ docker version
Client:
Version: 1.8.0
API version: 1.20
Go version: go1.4.2
Git commit: f5bae0a
Built: Tue Jun 23 17:56:00 UTC 2015
OS/Arch: linux/amd64
Server:
Version: 1.8.0
API version: 1.20
Go version: go1.4.2
Git commit: f5bae0a
Built: Tue Jun 23 17:56:00 UTC 2015
OS/Arch: linux/amd64
# HISTORY # HISTORY
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au> June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
June 2015, updated by John Howard <jhoward@microsoft.com>