centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 15:28:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
52,197 Commits 54 Branches 28 Tags
aaa2ecf8e08e6495ce7fc598a349d0a7216cd708
Commit Graph

279 Commits

Author SHA1 Message Date
Maria Bermudez
3cf34e8b60 Merge pull request #7626 from hacktivista/patch-1 
Update configs.md
 2019-04-02 12:11:21 -04:00
Maria Bermudez
41dfff114b Final edit 2019-04-02 09:09:51 -07:00
hacktivista
7e7297cc9d Update configs.md 2019-04-02 09:08:02 -03:00
Jonas
5bde184abd Fix links. 2019-03-14 15:14:39 +01:00
Maria Bermudez
dd128117e6 Addresses 7094 2019-02-28 13:48:12 -08:00
Sebastiaan van Stijn
03d5b3396d Use consistent formatting for notes 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-09 00:49:57 +01:00
Maria Bermudez
40c1d74b96 Merge pull request #7583 from orlvn/patch-1 
Update services.md
 2019-02-07 09:44:25 -08:00
Maria Bermudez
b853c7c290 Merge pull request #8132 from LStuker/patch-1 
CURRENT STATE instead of LAST STATE with docker 18.09.1
 2019-02-06 16:07:18 -08:00
Joel Kuzmarski
e10f2bc1b3 Update configs.md 
fix typo
 2019-02-06 15:23:27 -06:00
Maria Bermudez
0abb3de031 Move externally hosted images to the repo, and update image links 2019-02-05 16:14:01 -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
Sebastiaan van Stijn
652f6703bf Remove "edge-only" include 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 22:45:03 +01:00
paigehargrave
0dab4ade68 Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave
7b95f9ad5e Update secrets.md 2019-01-11 16:15:17 -05: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
Maria Bermudez
e31955bd7b Minor edit 2019-01-02 11:26:18 -08:00
Anton Romanov
92f6c3b169 update swarm-config.md, fix typo 
update swarm-config.md, fix typo
 2019-01-01 12:23:22 +08:00
Sebastiaan van Stijn
31d830a534 Remove reference to pre-1.12 standalone swarm 
Docker 1.12 and under has reached EOL a long time ago,
and should not be used (as they have unpatched vulnerabilities).

Standalone swarm is now in maintenance mode, so we can probably
remove this reference.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-12-23 11:26:40 +01:00
Maria Bermudez
be13b49abc Merge pull request #7698 from thaim/patch-1 
fix missing symbol to indicate start of command
 2018-12-13 10:42:34 -08:00
WeJie
4d67e28b63 Fix wrong command 
Should use ` docker service ps nginx` verify the nginx service is fully re-deployed, not `docker service ls nginx`.
 2018-12-07 23:22:46 +08:00
WeJie
d63986a46f Get some miss content back from commit history 2018-12-02 16:19:42 +08:00
thaim
1a2521cbc1 fix missing symbol to indicate start of command 2018-11-16 04:34:04 +09:00
Hacktivista
c695a430f0 Update configs.md 
configs key is not (and will not be) supported in docker compose, check https://github.com/docker/compose/issues/5110 for more info
 2018-11-07 11:15:49 -03:00
Justin I. Nevill
d393a90309 Merge pull request #844 from docker/beta-cleanup 
Removed Beta disclaimer tags
 2018-11-04 13:32:21 -05:00
Maria Bermudez
d7a21d29db Merge public:master into private 2018-11-02 10:03:18 -07:00
Anne Henmi
9417008906 Last of the files. 2018-11-02 09:28:22 -06:00
orlvn
a2a0a73764 Update services.md 
Tasks, not services are scheduled on nodes.
 2018-10-29 17:29:36 +01:00
Anne Henmi
69aa7d395d Update join-nodes.md 
Incorporated @JustinINevill's feedback.
 2018-10-16 08:55:58 -06:00
Anne Henmi
fc9fdb01ac Update join-nodes.md 
Added in @andrewhsu's feedback.
 2018-10-15 15:07:45 -06:00
Anne Henmi
7de1b2033e Update join-nodes.md 
Added beta tag.
 2018-10-10 10:49:01 -06:00
Anne Henmi
03e3c4dd51 Update join-nodes.md 2018-10-10 10:43:49 -06:00
Anne Henmi
432984c74d Update join-nodes.md 2018-10-10 10:43:02 -06:00
Anne Henmi
27446f1fba Update join-nodes.md 
Fixed @justincormack's clarification on running a mixed-FIPS environment.
 2018-10-04 19:29:09 -06:00
Maria Bermudez
eb608ee28d Merge branch 'master' into spelling 2018-10-04 12:18:34 -07:00
Anne Henmi
7d80bd0202 Included updates from https://github.com/docker/docker-core-backlog/issues/375. 2018-10-03 14:03:10 -06:00
Maria Bermudez
6c3bae4317 Update services.md 
Fixes [7435](https://github.com/docker/docker.github.io/issues/7435)
 2018-09-27 16:54:23 -07:00
Oscar Caballero
269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Anne Henmi
f4576b44fa Update swarm-mode.md 
fixed typo
 2018-09-19 07:56:03 -06:00
Anne Henmi
5ab93890e5 Update swarm-mode.md 
Incorporated @selansen's feedback
 2018-09-18 21:10:54 -06:00
Anne Henmi
329498653f Update networking.md 
Incorporated @bermudezmt's feedback
 2018-09-18 21:09:47 -06:00
Anne Henmi
8f465b4a01 Merge branch 'master' into swarm-default-network-670 2018-09-14 14:24:05 -06:00
Anne Henmi
783cc9fb4a Update networking.md 
Incorporated Maria's feedback.
 2018-09-12 18:12:57 -06:00
Anne Henmi
3695cd0b74 Update swarm-mode.md 
Cleaned up Mark's additions
 2018-09-12 13:30:41 -06:00
Anne Henmi
3bae1bb428 Update networking.md 
Cleaned up Mark's additions.
 2018-09-12 13:26:00 -06:00
Maria Bermudez
0cbcdb3777 Re-add swarm mode page 2018-09-10 14:56:59 -07:00
Mark Church
ea9e729e21 added default address pools installation/usage comments across UCP install, swarm install, and networking pages 2018-09-08 14:02:42 -07:00
Trapier Marshall
64279e87a6 fix swarm service constraint examples 
1. Be more specific about what happens when constraints aren't satified.
    2. There is no `--global`.  Also addressed in network/overlay.md.
    3. Label constraints do not match node labels without `node.label` prefix.

AFAIK neither 2 nor 3 have ever been correct

testedon: 17.06.2-ee-16
 2018-09-06 12:49:45 -04:00
Maria Bermudez
30390528f6 Delete swarm-mode.md 
Remove file from kubernetes branch.
 2018-09-04 11:26:03 -07:00