1. docker
  2. Commit 75070282f234bbcacf982c451c7046efd151a00f
Browse code

Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output

Update `service ps` output format in swarm tutorial to match 1.12.0
(cherry picked from commit e1b77bd69a0789652252b5a1b338839541250dc1)

Brian Goff authored on 2016/08/05 00:03:33
Showing 2 changed files
docs/swarm/swarm-tutorial/drain-node.md
History View file @ 7507028
... ... 
@@ -90,10 +90,11 @@ task assignments for the `redis` service:
90 90 
     ```bash
91 91 
     $ docker service ps redis
92 92
93 
-    ID                         NAME     SERVICE  IMAGE        LAST STATE              DESIRED STATE  NODE
94 
-    7q92v0nr1hcgts2amcjyqg3pq  redis.1  redis    redis:3.0.6  Running 4 minutes       Running        manager1
95 
-    b4hovzed7id8irg1to42egue8  redis.2  redis    redis:3.0.6  Running About a minute  Running        worker2
96 
-    9bg7cezvedmkgg6c8yzvbhwsd  redis.3  redis    redis:3.0.6  Running 4 minutes       Running        worker2
93 
+    ID                         NAME          IMAGE        NODE      DESIRED STATE  CURRENT STATE           ERROR
94 
+    7q92v0nr1hcgts2amcjyqg3pq  redis.1       redis:3.0.6  manager1  Running        Running 4 minutes
95 
+    b4hovzed7id8irg1to42egue8  redis.2       redis:3.0.6  worker2   Running        Running About a minute
96 
+    7h2l8h3q3wqy5f66hlv9ddmi6   \_ redis.2   redis:3.0.6  worker1   Shutdown       Shutdown 2 minutes ago
97 
+    9bg7cezvedmkgg6c8yzvbhwsd  redis.3       redis:3.0.6  worker2   Running        Running 4 minutes
97 98 
     ```
98 99
99 100 
     The Swarm manager maintains the desired state by ending the task on a node
docs/swarm/swarm-tutorial/rolling-update.md
History View file @ 7507028
... ... 
@@ -138,10 +138,13 @@ desired state:
138 138 
     ```bash
139 139 
     $ docker service ps redis
140 140
141 
-    ID                         NAME     SERVICE  IMAGE        LAST STATE              DESIRED STATE  NODE
142 
-    dos1zffgeofhagnve8w864fco  redis.1  redis    redis:3.0.7  Running 37 seconds      Running        worker1
143 
-    9l3i4j85517skba5o7tn5m8g0  redis.2  redis    redis:3.0.7  Running About a minute  Running        worker2
144 
-    egiuiqpzrdbxks3wxgn8qib1g  redis.3  redis    redis:3.0.7  Running 48 seconds      Running        worker1
141 
+    ID                         NAME         IMAGE        NODE       DESIRED STATE  CURRENT STATE            ERROR
142 
+    dos1zffgeofhagnve8w864fco  redis.1      redis:3.0.7  worker1    Running        Running 37 seconds
143 
+    88rdo6pa52ki8oqx6dogf04fh   \_ redis.1  redis:3.0.6  worker2    Shutdown       Shutdown 56 seconds ago
144 
+    9l3i4j85517skba5o7tn5m8g0  redis.2      redis:3.0.7  worker2    Running        Running About a minute
145 
+    66k185wilg8ele7ntu8f6nj6i   \_ redis.2  redis:3.0.6  worker1    Shutdown       Shutdown 2 minutes ago
146 
+    egiuiqpzrdbxks3wxgn8qib1g  redis.3      redis:3.0.7  worker1    Running        Running 48 seconds
147 
+    ctzktfddb2tepkr45qcmqln04   \_ redis.3  redis:3.0.6  mmanager1  Shutdown       Shutdown 2 minutes ago
145 148 
     ```
146 149
147 150 
     Before Swarm updates all of the tasks, you can see that some are running