Commit Graph

25124 Commits

Author SHA1 Message Date
Sainath Grandhi eebd6ac4df docker rename fix to address the issue of renaming with the same name issue #23319
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
(cherry picked from commit 3e8c16ef6d5e6b451996722d99f5d646ed8a0e56)
2016-06-30 16:47:48 -07:00
Alexander Morozov 0ec119e727 pkg/pools: avoid copy of sync.Pool
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit ba3af336eb0bd5bd6082b41bb4ce0ea542c3f008)
2016-06-30 16:47:48 -07:00
Tonis Tiigi de5fd9d641 Increase test timeouts for node state changes
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2e5da4434126309f2395cc3d5b2013674155ae5c)
2016-06-30 16:47:47 -07:00
Tonis Tiigi e546ffb37a Fix error reporting on executor wait
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit c895a76f1076c782011e9decf58ab6548cf0fb35)
2016-06-30 16:47:47 -07:00
Alvaro Saurin c2b195d3c2 Make sure we are trying to unmount a mounted /etc/resolv.conf
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
(cherry picked from commit 41cc7c4d9ddb6d6b9e024f30806adc82f1bb1d4a)
2016-06-30 16:47:47 -07:00
Alvaro Saurin 3e6c39e2ee Make sure we compare strings with the same capitalization
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
(cherry picked from commit ded347e744e74b99c023b30b53fcabe2c3bde24c)
2016-06-30 16:47:47 -07:00
Akihiro Suda 71dbab2235 update go-md2man to v1.0.5
Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly.
a8f937e113

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit cfe16e0d5b4bb7d1d194553f2a82cc1879d60e6b)
2016-06-30 16:47:47 -07:00
Tonis Tiigi 80405bef73 Do not show tasks from down nodes as active in ls
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 5d4401d6d72c647fa61501c40949b2d67c3f958b)
2016-06-30 16:47:47 -07:00
John Howard f3da720d8b Windows: Ensure frozen cope with prefix
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b820ead42674eca25c9718fb4de924405ec0c555)
2016-06-30 16:47:46 -07:00
Kenfe-Mickael Laventure 1641f5e308 Fix the value of the Components value in apt {In,}Release files
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 63b07130140242dffef01ce22d8c85cd7d93ab1a)
2016-06-30 16:47:46 -07:00
Derek McGowan d99f4cc83d Fix overlay2 ignoring whiteout files
Currently when overlay creates a whiteout file then the overlay2 layer is archived,
the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure.
When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored.
By skipping the copy of empty files, no open attempt will be made on whiteout files.

Fixes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit bd13c53f8dc1504c9e681dfabef2afc1685ccec7)
2016-06-30 16:47:46 -07:00
Serhat Gülçiçek f4de46d2ac Fix error for env variables example in docker reference - 2
The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.

When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe2, except only for one occurrence.

Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
(cherry picked from commit 7a30fa7af6f0bb3850ce6167850642420b4c0633)
2016-06-30 16:47:46 -07:00
Sven Dowideit eaf5b17592 Removing some url links that can be resolved using src markdown links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 01f9cbc3663cf134ca427e4f8b98bba637f6655e)
2016-06-30 16:47:46 -07:00
David M. Karr (fullname at gmail.com) 6de8049ab5 Update work-with-networks.md
The value of the Subnet and Gateway properties didn't match the command-line argument.

Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
(cherry picked from commit a54c3fbb8aa024c477864a0614506da3ea185839)
2016-06-30 16:47:46 -07:00
Alessandro Boch f312883f39 Add modules for secure overlay network to check-config.sh
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit c355e059cc1a4f66338a039240195c66dc928e73)
2016-06-30 16:47:45 -07:00
Alessandro Boch ada93c7182 Vendoring libnetwork ed311d0
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e26c513fa818a57b4ea572121e153cf6f056e1ee)
2016-06-30 16:47:45 -07:00
Alessandro Boch e928358dfb Vendoring vishvananda/netlink 734d02c
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0)
2016-06-30 16:47:45 -07:00
Antonio Murdaca ae0648fca8 contrib: builder: rpm: add Fedora 24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 0b83f27328eab843d79c94dd603f52e8fb9c013b)
2016-06-30 16:47:45 -07:00
orkaa d4cdc5172c For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
(cherry picked from commit 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0)
2016-06-30 16:47:45 -07:00
Steve Durrheimer 790501e51f Add zsh completion for 'load' and 'save' image events
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit e2f1f699b39d30d71a9afc9af7027088970aa4fd)
2016-06-30 16:47:45 -07:00
Steve Durrheimer 7b643a09d5 Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 704d9b6864cc81a1564f482a2dfbaa32b9c5e905)
2016-06-30 16:47:44 -07:00
Steve Durrheimer c6721ada67 Add zsh completion for 'docker run --storage-opt size='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 857e7d6ae4f78184c70b2047ed45b24a6732537d)
2016-06-30 16:47:44 -07:00
Steve Durrheimer 3714e9b393 Re-Add zsh completion for '-c' alias to '--cpu-shares'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 4c23ac0ae5103a1238c25cd1216507e9d6eec779)
2016-06-30 16:47:44 -07:00
Steve Durrheimer 27d64ec8ad Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 8e582a257326496cc27d30751b759a37f993d116)
2016-06-30 16:47:44 -07:00
Tonis Tiigi 43014ea54b Fix opts tests after default port fix
The code for default port was already there but
it didn’t work because split function errored out
before. This should be the desired behavior that
matches daemon listen address with swarm listen
address.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 0a4a0d9800aa62daf2b980b82c1840cd6f7d0e34)
2016-06-30 16:47:44 -07:00
Tonis Tiigi 3d06cd4910 Unify swarm init and update options
Add api side validation and defaults for init and
join requests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit fb3eb1c27ef5520571c599ead8a72b343748db39)
2016-06-30 16:47:44 -07:00
Stefan J. Wernli 8691607ade Fixing file handle leak for "docker logs"
If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container.  Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close.  This change addresses both cases.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
(cherry picked from commit 54f11b84d218c1a7ff4ab4e2148819265da213bc)
2016-06-30 16:47:44 -07:00
Kai Qiang Wu(Kennan) db4153cc90 Fix the missing 'ls'
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
(cherry picked from commit cbd240581f274c3599efb1c43b01cb61607c79d0)
2016-06-30 16:47:43 -07:00
Shishir Mahajan c984a6cdc8 Man page fix: 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 dc3fdfbe5bb5aff4ebd8f7025ace4bd6009d3db4)
2016-06-30 16:47:43 -07:00
Eric Barch 060b6c4363 Add missing words in the swarm docs
Signed-off-by: Eric Barch <barch@tomesoftware.com>
(cherry picked from commit db158e9182f86adc721d6c401782983bfe51fd49)
2016-06-30 16:47:43 -07:00
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