Pārlūkot izejas kodu

Update docker info output example

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 9 gadi atpakaļ
vecāks
revīzija
07e1c62bf4
2 mainītis faili ar 15 papildinājumiem un 4 dzēšanām
  1. 5 2
      docs/reference/commandline/info.md
  2. 10 2
      man/docker-info.1.md

+ 5 - 2
docs/reference/commandline/info.md

@@ -45,19 +45,22 @@ storage driver and a node that is part of a 2 node Swarm cluster:
      Paused: 1
      Paused: 1
      Stopped: 10
      Stopped: 10
     Images: 52
     Images: 52
-    Server Version: 1.11.1
+    Server Version: 1.12.0-dev
     Storage Driver: overlay
     Storage Driver: overlay
      Backing Filesystem: extfs
      Backing Filesystem: extfs
     Logging Driver: json-file
     Logging Driver: json-file
     Cgroup Driver: cgroupfs
     Cgroup Driver: cgroupfs
     Plugins:
     Plugins:
      Volume: local
      Volume: local
-     Network: bridge null host
+     Network: bridge null host overlay
     Swarm: 
     Swarm: 
      NodeID: 0gac67oclbxq7
      NodeID: 0gac67oclbxq7
      IsManager: YES
      IsManager: YES
      Managers: 2
      Managers: 2
      Nodes: 2
      Nodes: 2
+    Runtimes: default
+    Default Runtime: default
+    Security Options: apparmor seccomp
     Kernel Version: 4.4.0-21-generic
     Kernel Version: 4.4.0-21-generic
     Operating System: Ubuntu 16.04 LTS
     Operating System: Ubuntu 16.04 LTS
     OSType: linux
     OSType: linux

+ 10 - 2
man/docker-info.1.md

@@ -41,14 +41,22 @@ storage driver:
      Paused: 1
      Paused: 1
      Stopped: 10
      Stopped: 10
     Images: 52
     Images: 52
-    Server Version: 1.11.1
+    Server Version: 1.12.0-dev
     Storage Driver: overlay
     Storage Driver: overlay
      Backing Filesystem: extfs
      Backing Filesystem: extfs
     Logging Driver: json-file
     Logging Driver: json-file
     Cgroup Driver: cgroupfs
     Cgroup Driver: cgroupfs
     Plugins:
     Plugins:
      Volume: local
      Volume: local
-     Network: bridge null host
+     Network: bridge null host overlay
+    Swarm: 
+     NodeID: 0gac67oclbxq7
+     IsManager: YES
+     Managers: 2
+     Nodes: 2
+    Runtimes: default
+    Default Runtime: default
+    Security Options: apparmor seccomp
     Kernel Version: 4.4.0-21-generic
     Kernel Version: 4.4.0-21-generic
     Operating System: Ubuntu 16.04 LTS
     Operating System: Ubuntu 16.04 LTS
     OSType: linux
     OSType: linux