InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,010 Commits 21 Branches 532 Tags
175f1829377413b1887a0c38232b1cda975fd71c
Commit Graph

623 Commits

Author SHA1 Message Date
Adrien Duermael
915f6046bc fixed broken links in docs 
I need this to be merge to solve that issue: https://github.com/docker/docker.github.io/issues/1068, and merge new CI tests for the docs: https://github.com/docker/docker.github.io/pull/1052

Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2017-01-13 11:52:09 -08:00
Adrien Duermael
c529d3d7ee docs: removed links to stack_tasks & stack_ls 
`docsreference/commandline/stack_tasks.md ` &  `docsreference/commandline/stack_ls.md` do not exist.

I need this to be merge to solve that issue: https://github.com/docker/docker.github.io/issues/1068, and merge new CI tests for the docs: https://github.com/docker/docker.github.io/pull/1052

Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2017-01-13 11:44:11 -08:00
Chris Gavin
b37fda12fb Fix a spelling mistake in the docs. 
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
(cherry picked from commit 35c82f422d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 20:15:56 +01:00
Misty Stanley-Jones
1f6bda6d20 Document publishing a UDP port 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 2178c840ba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 20:11:25 +01:00
Misty Stanley-Jones
bf1a4d88bc Fix copypaste error 'is-automated' 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 2333657e1b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 20:03:16 +01:00
John Howard
c00b451d46 Windows: Note about volumes in run 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b9e65f40cf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 20:01:35 +01:00
bbayani
bff68bc605 Clarify that ipmasq rules are not added when iptables is false 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit db3f06fd97)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 20:01:34 +01:00
dattatrayakumbhar04
09b09c34b3 28600: Docs: network connect for container in Created/Stopped state 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
(cherry picked from commit 16c9cdad6f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 20:01:34 +01:00
yuexiao-wang
1b01e2f1df Update the subtitle for stack ps 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 98fb1644c2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 19:10:55 +01:00
Akihiro Suda
fb0b19aa2e update docs/reference/commandline/network_inspect.md 
The following sentences (introduced in v1.11 via #21160) were misleading for Swarm mode services (>= v1.12)

  For networks backed by multi-host network driver, such as Overlay,
  this command also shows the container endpoints in other hosts in the
  cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 2c288e60db)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 19:09:53 +01:00
Alicia Lauerman
39466e3144 add documentation for docker stack ps 
also updates related stack docs and removes stack_tasks.md

Signed-off-by: Alicia Lauerman <allydevour@me.com>
(cherry picked from commit 970ab9a224)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 19:07:57 +01:00
Yong Tang
3707a30459 Update docs for node filter of docker service ps 
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit c326e0afe3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-12 18:55:03 +01:00
GuyTempleton
1d7418f212 Add missing quote mark and fix grammar in inspect docs 
Signed-off-by: GuyTempleton <Guy.Templeton@skyscanner.net>
 2016-11-21 09:10:28 +00:00
Misty Stanley-Jones
cf60af87f9 Formatting changes to make 1.12.x ref docs buildable in Jekyll 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-09 13:07:24 -08:00
Misty Stanley-Jones
68aca71637 Fix link to non-existent file 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ca04f02d76)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:29:07 +02:00
Sebastiaan van Stijn
ca474f7808 Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fd7161bb30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:52 +02:00
yuexiao-wang
d4288a3212 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 0483d77613)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:34 +02:00
Sebastiaan van Stijn
7da3e5d0b2 Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 533b00da8b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:59 +02:00
yuexiao-wang
5508a82cac fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 0f0b0db842)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:45 +02:00
Misty Stanley-Jones
0e29518469 Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
(cherry picked from commit 5880d62953)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:28 +02:00
Sebastiaan van Stijn
3bd4612aaf Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit eb3a01eb43)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:25:31 +02:00
Alessandro Boch
e289fc155a Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e74a937b00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:46 +02:00
Sebastiaan van Stijn
c84d8b8360 Use "sudo" for dockerd examples 
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 87b174080b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:23:30 +02:00
Sebastiaan van Stijn
ae9b46dbd0 Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7ca02f86de)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:17:53 +02:00
Sebastiaan van Stijn
a8aaf5bfad Synchronize push reference with man page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dddea689ab)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:17:37 +02:00
Sebastiaan van Stijn
c6ba6498b3 Restore missing "format" example 
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit edbb8fb86d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:17:29 +02:00
Victor Vieux
1ec9ca1ca6 Merge pull request #26866 from docker/cherry-picks-1.12.2 
Cherry picks 1.12.2
 2016-09-27 13:33:29 -07:00
Sebastiaan van Stijn
e9c655442a 1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm" 
This reverts commit 44180a48e9,
as `docker create --rm` is part of docker 1.13, so should
not be in the 1.12 branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-27 16:33:53 +02:00
Yong Tang
e892a54fa1 Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit b9e46235fa)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-26 19:33:52 -07:00
Misty Stanley-Jones
24df982128 Clarify usage of --force when used on a swarm manager 
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 7b5c3d935a)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-26 19:33:45 -07:00
Sebastiaan van Stijn
99ed95cb57 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:13 -07:00
Brian Goff
9ec857ad5a Merge pull request #26472 from yongtang/09112016-docker-build-step-0 
Fix documentation for `Step 0` to `Step 1` in `docker build`
(cherry picked from commit e41839e8a1)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:12 -07:00
Vincent Demeester
0183b3bf8c Merge pull request #26426 from sfsmithcha/carry_pry_25414 
Carry pr 25414
(cherry picked from commit e6f76800f5)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:12 -07:00
Michael Crosby
b23bff1d9f Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
(cherry picked from commit 061cc41759)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:12 -07:00
Misty Stanley-Jones
bf637439e7 Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option" 
This reverts commit eea99cd001.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-12 11:02:09 -07:00
Vincent Demeester
eea99cd001 Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
(cherry picked from commit 01fe5639bc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:58 -07:00
Brian Goff
8a56561528 Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:37 -07:00
Charles Smith
dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:29 -07:00
Sven Dowideit
be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates 
2016.09.08 engine docs updates
 2016-09-09 21:43:38 +10:00
Sven Dowideit
bf7d335513 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f112)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-08 14:34:00 -07:00
Vincent Demeester
11330bf048 Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
(cherry picked from commit da763602af)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:31:59 -07:00
Vincent Demeester
95bc4519d2 Merge pull request #26241 from YuPengZTE/devNote 
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbd)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:28:39 -07:00
Vincent Demeester
a42e2a0e42 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect 
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:18:44 -07:00
Vincent Demeester
1e9fb2f18e Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate 
provide actual command format for docker network create
(cherry picked from commit 37fd1416da)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:17:10 -07:00
Vincent Demeester
748f3ef8e3 Merge pull request #26185 from yuexiao-wang/update-docs 
Update description for docker plugin inspect
(cherry picked from commit 0414a2c1a9)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:11:34 -07:00
Sven Dowideit
5c34d579dc Merge pull request #26302 from vdemeester/health_status-in-event-docs 
Add health status as action on events documentations
(cherry picked from commit b468df9eac)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:04:23 -07:00
Vincent Demeester
7e2259bb63 Merge pull request #26271 from AkihiroSuda/fix-service-create-doc 
update docs/reference/commandline/service_create.md
(cherry picked from commit 1a04d7b1e1)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:03:07 -07:00
Justin Cormack
9bef12dcfd Merge pull request #26096 from ohmystack/fix/docs-dockerd 
Add docs for "--containerd" in dockerd
(cherry picked from commit 644cb53b41)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:31:55 -07:00
Doug Davis
44180a48e9 Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm 
Update docs for `docker create` to include `--rm` flag
(cherry picked from commit 91ec7fa811)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:29:55 -07:00
Vincent Demeester
af9378f713 Merge pull request #25996 from yuexiao-wang/fix-docker-daemon 
Replace docker command from 'docker daemon' to 'dockerd'
(cherry picked from commit aff33055ac)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:06:57 -07:00