Commit Graph

25094 Commits

Author SHA1 Message Date
bin liu 6a5a150722 fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
(cherry picked from commit 950073aabb305db6156709ea8509b1f72ff06f3b)
2016-06-30 16:47:43 -07:00
nick 62d50a3f13 Fix misspell typos
Signed-off-by: nick <nicholasrusso@icloud.com>
(cherry picked from commit 7135afa79b4d99ba2a214fcc1c2decf95f850c2f)
2016-06-30 16:47:43 -07:00
Aaron Lehmann 56d53adab1 Fix parallel push of the same image to different registries
Layer uploads are deduplicated by a "key" made up of the layer DiffID
and the repository name. The repository name being used to form this key
was a remote version of the name that didn't include the name of the
registry. Consequently, pushes of the same layer in a repository with
the same remote name to different registries would wrongly be
deduplicated.

Correct the key by using the full name of the repository, which includes
the registry hostname as well as the image's name.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 1333ef3ca381976438d4ae10f6b0e9be21e1a9ba)
2016-06-30 16:47:43 -07:00
Ken Cochrane 8f677417d1 Fixed issue #23787 install script not working for RHEL7 host
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
(cherry picked from commit 0e84474672fb30449028b4f7a678d5ab6a81f102)
2016-06-30 16:47:42 -07:00
Sven Dowideit 3d5903a45f Now that the Docker4 links are online, we can use them
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9)
2016-06-30 16:47:42 -07:00
Akihiro Suda ba77356d98 Add overlay2 description to overlayfs-driver.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b)
2016-06-30 16:47:42 -07:00
Harald Albers 5604fb2362 bash completion for `-c` alias to `--cpu-shares`
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 79296b2770b6d629a2e6ab02f888294a99f62153)
2016-06-30 16:47:42 -07:00
Harald Albers b23562ea20 bash completion for `docker daemon --storage-opt btrfs.min_space`
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit f693b99870031a6f5311defa9aba13b690323594)
2016-06-30 16:47:42 -07:00
Harald Albers 0afeae16de bash completion for `docker {run,create} --storage-opt`
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 7d2ffa00c08e2f316285fe2f9adf81255f5ae688)
2016-06-30 16:47:42 -07:00
Harald Albers 749f94e885 bash completion for `load` and `save` image events
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 5334520bf04598121b026c0b5018714fd4120d44)
2016-06-30 16:47:41 -07:00
Harald Albers 5188629256 bash completion for `docker daemon --storage-driver olverlay2`
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit d96eeff19416be61e7e021c9dfaed8728a177d02)
2016-06-30 16:47:41 -07:00
Harald Albers 9117c0dd41 bash completion for `docker {run,create,network connect} --link-local-ip`
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 98483f57ed984acd0d1c1f0de85c2b82c0308896)
2016-06-30 16:47:41 -07:00
Steve Durrheimer 7d72ca329c Add zsh completion for 'docker daemon --live-restore'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 8036fc794a54323d28e2179267fd7201eca5b76a)
2016-06-30 16:47:41 -07:00
Kenfe-Mickael Laventure df987c84de Fix missing container runtime on upgrade
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit d7ceda4e375250e6868854cca96c49a369503745)
2016-06-30 16:47:41 -07:00
Shishir Mahajan 16274ba940 PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
(cherry picked from commit fe6416d04fb3ccd83fe4fb3a73f0364b88da730a)
2016-06-30 16:47:41 -07:00
Kevin Jing Qiu c7d35daad8 Fix some doc typos and spacings
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
(cherry picked from commit 3b2ee9a704f1e3974dbb9ce857886d5e377580ab)
2016-06-30 16:47:40 -07:00
Sebastiaan van Stijn 1b053efb5a Sync API changes from 1.25 -> 1.24
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.

This updates the 1.24 API with the same changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 93095b1699eb11e1bd256dcf8f42f34f50ec2c78)
2016-06-30 16:47:40 -07:00
Charles Smith 803b4d30a6 clarify swarm concept
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e0296317131782008dcb94c72d591244663d61b1)
2016-06-30 16:47:40 -07:00
Lei Jitang c51fced060 Fix link doesn't work sometimes when container start with multiple networks
If there is multiple networks to connect to on container starting,
the order of these networks is random because we "range a map". But
the defautl network "bridge" should be connected first since only
"bridge" support link and we should have do some settings on sandbox
creation, and only the first connect will setting the sandbox.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 57c0a653e3d0055e63db399019b3b16d4ac97004)
2016-06-30 16:47:40 -07:00
Derek McGowan aa123b73d1 Add tests for rmi
Add integration test for removing by image id with tag and digest reference to the same repository.
Add integration test to ensure only tag to other repository remains after deleting tag with accompanying digest reference.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 5cff374b140b4a836b7082d009bcfe9a6e96f1af)
2016-06-30 16:47:39 -07:00
Derek McGowan 611bbed2df Update rmi logic for canonical references
Updates the rmi code to treat canonical references as related to tagged references from the same repository during deletion.
Canonical references with a different repository name will be treated as separate references.
Updates the remove by ID logic to still remove an image if there is a single tag reference and only canonical references to the same repository remaining.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit a281be1c11d61deed7cb2853125e6d489f16aa2e)
2016-06-30 16:47:39 -07:00
Daniel Nephin 8a93ff1ffb Remove dead code from node update.
Also share mode code between update commands
and use flag constants

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit cacaeab9db51f42c33872c6cce1adc3e55f1c9c5)
2016-06-30 16:47:39 -07:00
Daniel Nephin 0641b8ba9c Use flag constants for swarm flag.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e)
2016-06-30 16:47:39 -07:00
Daniel Nephin 7b0bb3f92c add more flag constants to service update.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 9d1f3373b3678033c1be197fafc55010cc8531dd)
2016-06-30 16:47:39 -07:00
Charles Smith 3f276b58a5 update docker swarm cli
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 78ebfaff1a426425573c440c24eb0f36ffed4d8c)
2016-06-30 16:47:39 -07:00
Harald Albers 75193e58ce fix bash completion for `docker {swarm,node}` subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e65f036e134c428b1303b00a8f08b0eea79f0701)
2016-06-30 16:47:38 -07:00
Harald Albers a4e3415235 correct sort order in new bash completions
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 19753ec84dcd2961adf64c4c66b09a2f4ca3220a)
2016-06-30 16:47:38 -07:00
Mike Goelzer b8b938c61c Add bash completion for `docker service scale`
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker

(cherry picked from commit 5cf73a47f5327c38b27400012333a9e569f1a584)
2016-06-30 16:47:38 -07:00
Sebastiaan van Stijn 2899866c63 Fix markdown formatting for experimental
- don't indent code-blocks that use fences
- fixed some formatting
- wrapped long lines to 80-chars
- removed stray empty lines

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a92f6551c92aae23ec88880b406c8854dcfa9b4a)
2016-06-30 16:47:38 -07:00
Michael Friis 9157831d16 bring dab into title and intro
Signed-off-by: Michael Friis <friism@gmail.com>
(cherry picked from commit 6defef56194e7fe74f6f1bbc0ccb0565bc51ffd1)
2016-06-30 16:47:38 -07:00
Michael Friis cabc0df64d expand stack doc
Signed-off-by: Michael Friis <friism@gmail.com>
(cherry picked from commit cd2237c2bc6bce738a42a7eaf0ba82d57857fe2f)
2016-06-30 16:47:38 -07:00
Zhang Wei c40debc362 Make --help information consistent
Other docker command always print "[OPTIONS]" right after `docker
COMMAND`, but `build` and `push` has inconsistent help message.

This commit will fix help information format.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
(cherry picked from commit 0e5397633628ab154fae33152de7dc1fd4e122db)
2016-06-30 16:47:37 -07:00
Charles Smith 1784366694 add links to swarm and service commands to swarm mode overview
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit c13c5601961bb5ea30e21c9c8c469dd55a2f17d0)
2016-06-30 16:47:37 -07:00
Tonis Tiigi 8a994d4724 Don’t try to restore swarm from incomplete state
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit ded1d9af38cb467dadab0521936174eef0d4bc9e)
2016-06-30 16:47:37 -07:00
Yong Tang abb6e38208 Fix reference link error in Jenkins docs failure
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa)
2016-06-30 16:47:37 -07:00
Yong Tang 92ffbd2b52 Fix `docker start` error with renamed container
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.

The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.

This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.

Additional integration tests have been added to cover this fix.

This fix fixes #23716.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 6e86733b47faf0d7629751987346022544b65cb7)
2016-06-30 16:47:37 -07:00
Jana Radhakrishnan 2b45db42b2 Vendoring @ab62dd6bf06bf0
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 663159e9acb93ea571e8aec0a687fcc16fd96dff)
2016-06-30 16:47:37 -07:00
Charles Chan fe2a9bea38 Update help output to match Docker 1.11.
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 17ae6539f6bfc20792d0a25b3f98adfce96e7337)
2016-06-18 20:58:25 -07:00
Charles Smith dd39dbe79c update cli commands output for rc1, revise key concepts
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 9499d5fd522e2fa31e5d0458c4eb9b420f164096)
2016-06-18 20:58:25 -07:00
Sven Dowideit e8e1fbb72f bad url
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45)
2016-06-18 20:58:25 -07:00
Sven Dowideit d546db33ff href links are not converted from file.md by hugo
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit ad1819ca1d56a0e2caae2f0f28d14a456686e00b)
2016-06-18 20:58:24 -07:00
Daniel Nephin 3c35da6029 Add tests for AutoAcceptOption
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c544649874bfecf2e6b8a00a0b25db309d81cf94)
2016-06-18 20:58:24 -07:00
Daniel Nephin e090e2dbd4 Support a listen addr without a port, and add tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 595e79b805fd6e96d2e6c8876f7c9734164f5db7)
2016-06-18 20:58:24 -07:00
Victor Vieux 6b2cd6e843 accept uppercase endpoint mode
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 8a0c5f157892efdfd5119410adedf0f04c9c16cf)
2016-06-18 20:58:24 -07:00
Jana Radhakrishnan 0728f28cbe Vendoring swarmkit @3f135f206179e
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 64a567d24c147379dc79b54cf2140c4e7905c022)
2016-06-18 20:58:24 -07:00
tomwbarlow@gmail.com 9e1d592de3 Change log.printf service creation msg to debug
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
(cherry picked from commit eed8d14ed16846f926e2d139e8232fbc2d4641e4)
2016-06-18 20:58:24 -07:00
Arnaud Porterie (icecrime) f1f2461e09 Change `docker service update` semantics
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
(cherry picked from commit 1f8ab93b4422a88ef3053105c17acf1933576fbe)
2016-06-18 20:58:23 -07:00
Harald Albers ffb4daf0fb fix bash completion for `docker service` subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145)
2016-06-18 20:58:23 -07:00
Sebastiaan van Stijn d5c89ec65e Add initial "service" docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf)
2016-06-18 20:58:23 -07:00
Victoria Bialas d1c91b41e1 install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
fixing links to d4mac and d4win

updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.

updates per Sven's comments in the PR

removed duplicate line in tutorials menu.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 5bc730eda76351ab669a60a5fc95fd273e399d88)
2016-06-18 20:58:23 -07:00