Commit Graph

53 Commits

Author SHA1 Message Date
Maria Bermudez dd128117e6
Addresses 7094 2019-02-28 13:48:12 -08:00
LStuker 69e4ed2f24
CURRENT STATE instead of LAST STAT
With Docker version 18.09.1, build 4c52b90, the command `docker service ps helloworld` shows CURRENT STATE instead of LAST STATE.

Here is my example output of the command:
```
[root@docker01 ~]$docker service ps helloworld
ID                  NAME                IMAGE               NODE                DESIRED STATE       CURRENT STATE           ERROR               PORTS
3tj4b0gho76v        helloworld.1        alpine:latest       docker01            Running             Running 3 minutes ago

[root@docker01 ~]$ docker --version
Docker version 18.09.1, build 4c52b90
```
2019-02-03 10:44:50 +01:00
paigehargrave 403da538a2
Update create-swarm.md 2019-01-11 13:12:20 -05:00
paigehargrave 4fb1c403ea
Update index.md 2019-01-11 13:01:08 -05:00
paigehargrave bb19d49405
Update index.md 2019-01-11 10:19:57 -05:00
thaim 1a2521cbc1 fix missing symbol to indicate start of command 2018-11-16 04:34:04 +09:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
ada dd7a802a9d Clarify the DRAIN state w/ regard to containers (#5811)
* Clarify the DRAIN state w/ regard to containers

Bare containers are not state-reconciled, and are not affected by the swarm DRAIN state
2018-01-24 11:35:53 -08:00
kphunter 9308caf1f4 adds hostname to bash prompts (#5312) 2017-11-15 16:54:47 -08:00
Victoria Bialas a4b4acc92c Fix links to subtopics in index.md files by include full path (#4054)
* for all links to , changed to full path

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed link in Swarm Tutorial per review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-31 18:54:08 -07:00
Misty Stanley-Jones 023278aff2 Add link to Docker Machine setup for Linux hosts (#3711) 2017-06-26 15:44:04 -07:00
Misty Stanley-Jones 464599c2a6 Clarify what "networked host machines" means (#3657)
Fixes #3646
2017-06-19 11:52:02 -07:00
Michael Friis 6d067495f2 broken anchor (#3642) 2017-06-16 16:28:37 -07:00
John Mulhausen dbf16812ac Fixes #2062 2017-04-25 17:22:26 -07:00
Guilherme Rezende 566af4709c Update delete-service.md (#2956)
`docker service ps` needs the SERVICE-ID as a parameter, and the service don't exist after removed.
2017-04-21 11:19:25 -05:00
Misty Stanley-Jones a1291c8ef6 Add missing text (#2569) 2017-03-30 16:02:00 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Wang Jie 31d10935fb Update scale-service.md (#1961)
Deleted "you can" because it shoud be "you must" in fact, so use imperative instead.
2017-02-27 13:11:01 -08:00
Victoria Bialas 5f152ba7d9 Merge pull request #1952 from londoncalling/swarm-tutorial-onpage-links
swarm mode tutorial improvements
2017-02-23 18:10:01 -08:00
Victoria Bialas 7aaf72119d updated swarm and voting app tutorials per d4mac, d4win, toolbox and driver issues
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 17:48:22 -08:00
scjane 1ad3112d03 Update rolling-update.md (#1935)
* Update rolling-update.md
2017-02-23 16:56:13 -08:00
Victoria Bialas d4add4ee20 swarm mode tutorial improvements
modified what's next link to map to left nav TOC

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 15:21:31 -08:00
scjane e970a64a97 Update create-swarm.md (#1934) 2017-02-23 01:18:15 -08:00
scjane cb79fe5a1a Update create-swarm.md (#1933) 2017-02-23 01:17:02 -08:00
Victoria Bialas 1d21dea18e voting app graceful shutdown, d4win compatibility
fixed tips and links

copy-edits and re-wording finishing touches

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-22 21:27:33 -08:00
Alessandro Boch 46a9be7289 Clarify port to open for overlay networking (#1762)
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-16 11:52:55 -08:00
Alessandro Boch 649210111a Fix docs about what protocol must be allowed for network encryption
- This was inadvertently changed to `port`

Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-06 10:04:31 -08:00
C.X. Ling 49a333885d Fix rendering of code block for swarm tutorial (#1370)
Indentations are added to fix rendering failure.
2017-01-25 11:01:00 -08:00
John Mulhausen 88a190986a Fixes rendering problems 2017-01-20 11:37:14 -08:00
Misty Stanley-Jones e3a3145cd9 Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
2017-01-19 10:10:15 -08:00
Viet Hung Nguyen 956f77d618 Clarify the command only for docker-machine (#1149)
* Clarify the command only for docker-machine
2017-01-18 15:17:18 -08:00
lj8930 cb3d925f7f fix typo in swarm tutorial 2017-01-17 11:24:55 +08:00
Juan Eugenio Abadie 9880cc46f2 Fix title (#1056)
The title is not rendered correctly because of the missing newline
2017-01-09 14:04:05 -08:00
LRubin 8cdcd420b0 Update create-swarm.md (#954)
Removes some spaces that were apparently b0rking the code block there.
2016-12-20 17:20:30 -08:00
Misty Stanley-Jones 8e7f320f2c Clarify when the task containers are deleted
Fixes #683
2016-12-08 09:48:46 -08:00
Misty Stanley-Jones 756f4d974c Fix some doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 11:32:17 -08:00
LRubin 26ce688e26 Adds a space to correct broken code block
Kramdown is picky. :)
2016-11-18 15:31:25 -08:00
fresnizky b0e05667f9 Added command for ssh into swarm manager 2016-11-12 19:27:34 -03:00
Gaetan a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:45:24 -08:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Adrien Duermael e7ab7f7d03 removed menu.md files
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-10-31 13:45:56 -07:00
Misty Stanley-Jones d92715537f Merge pull request #230 from afrazkhan/master
Info about IP 50 needing to be open
2016-10-19 14:52:10 -07:00
John Mulhausen f8776699de Merge pull request #223 from danix800/fix-typos
Fix typos.
2016-10-18 16:31:21 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
Ding Fei bab82e94f6 Fix typos and updated a few links, some sentences.
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
2016-10-18 17:04:10 +08:00
Afraz Ahmadzadeh dcfbf407b0 Typo in docs 2016-10-18 07:58:08 +02:00
Afraz Ahmadzadeh 0dcdc43cb1 Info about IP 50 needing to be open 2016-10-17 10:29:28 +02:00
John Mulhausen a0ee6c6004 Rendering fixes, part 1 (up through cs-engine) 2016-09-30 19:38:30 -07:00