Commit Graph

25766 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 21e168053f Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context
Add missing docs about binary remote contexts
(cherry picked from commit b4abe38d43f1158b3c085ef006e88740296a3020)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:44:11 -07:00
Sebastiaan van Stijn 88bd4cb0ea Merge pull request #25704 from thaJeztah/cleanup-api-markdown
Cleanup API docs Markdown formatting and wording
(cherry picked from commit 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:41:54 -07:00
Tibor Vass 23cf638307 Bump VERSION to v1.12.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 21:40:58 -07:00
Tibor Vass 3e4c33365f Merge pull request #25830 from tiborvass/cherry-pick-25825
[1.12] Fix volume not working after daemon restart
2016-08-17 21:05:32 -07:00
Brian Goff e8ed523480 Fix volume not working after daemon restart
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.

In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.

Ensures 2 things:

1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.

2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 246d1eb58e807f2cf2d2b387e267dcfa228f96a8)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 20:17:09 -07:00
Tibor Vass 5d29b79241 Merge pull request #25780 from thaJeztah/1.12.1-docs-cherry-picks
1.12.1 docs cherry picks
2016-08-17 20:01:46 -07:00
Tibor Vass 6e7b8f41ca Merge pull request #25787 from tiborvass/cherry-pick-23790
[1.12] Skip always pulling images on integration tests
2016-08-17 20:00:56 -07:00
Tibor Vass bd8d47e028 Merge pull request #25811 from aaronlehmann/swarm-changelog
Add swarm section to 1.12.1 changelog
2016-08-17 17:14:55 -07:00
Eivin Giske Skaaren c745f4db98 "Annotations" not a parameter
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit 69e481af4e1fec65629c6ea4eb74fc58f5abc932)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Eivin Giske Skaaren b313230fa8 Capital D in "ID" returned when creating service
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit 9eb2ec799eb37210dee5183ace375e480bbfd8aa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Eivin Giske Skaaren a193f2995e Add doc for inspect swarm
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit c59bc537274aa7f4dc9702ea08c349c71a024b39)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Sebastiaan van Stijn 0f63ddb03d Fix capitalization
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 75e60fbe09f6065ed095671f98713d862c466858)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Sebastiaan van Stijn 2875711fe7 Restore missing ps example for killed containers
This example was added in b0b2f979c7,
but got lost during splitting up the cli.md docs into separate files;
561bfb268d

This restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8d5818a6931db9d0acd4a6663815cd317da1bb6b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn e24421a6ef Move sysctls to correct API version
Commit 067b510dfc move the
sysctls feature to the right API version, but
missed this one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7cdd693d5d2094f73383145eb74d81c6b9bb9b24)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn e2c8597c8f Add X-Registry-Auth header to service API docs
The service create/update endpoints support
passing registry-authentication information,
but this was not documented.

This adds the missing information about passing
a X-Registry-Auth header.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bde35ef18a408a297b960c439dc029cfb5e15464)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Akihiro Suda f436a41d0c Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Close #25409
Update #10180

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit aab101a770a88cdbde5012dc7eb5b4439cf57192)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
lixiaobing10051267 fc8a0f4786 command "docker service remove" not insistant
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 078e2aa1571ad402f0a9599e6fac2286a3d35f54)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sven Dowideit 9bc8e7858c James' site has been dead for a while - removing links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit a9b08f3102e946df44337deb65c99b41570754d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
David Lechner a30a0b07a4 Move export from image commands to container commands
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
(cherry picked from commit 43c8cc7bb4dd42bebabf68e509a3596ef7a642cd)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Matt Bentley 05e1e65ca7 Add install of virtual kernel extras for AUFS
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
(cherry picked from commit e715ca506f41b22cde21187328fcb416cec5e6a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Charles Smith 4534b9e6c3 add overlay networking guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Charles Smith 3da4ac64af add overlay networking security model node
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cc5debcb2e8621358721eb860c07f33f8b83d684)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Tonis Tiigi 13e82f23c8 Skip always pulling images on integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e2226223e614716749cdb7701a130c7449f5f854)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 14:19:31 -07:00
Aaron Lehmann 74cdda0333 Add swarm section to 1.12.1 changelog
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-08-17 14:10:42 -07:00
Tibor Vass 236317fa56 Bump VERSION to v1.12.1-rc2
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 21:30:11 -07:00
Tibor Vass f806ae4838 Merge pull request #25767 from tiborvass/1.12.1-rc2-cherrypicks
1.12.1 rc2 cherrypicks
2016-08-16 21:26:03 -07:00
Tibor Vass a544fe4b38 Vendor swarmkit to change root key to P-256
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Anusha Ragunathan 09dc9a2a9e Debugging issue #25511
Volumes and other content created under a bind mount should be
recursively propagated using rshared, not shared. This could be
the reason for EBUSY during removal. Override options with rbind,
rshared and see if CI errors are fixed.

May fix #25511

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit e58028d078077dc566639ff52ece09ad6c481e44)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Tonis Tiigi f21cdf48f9 Add retry checks to TestSwarmPublishAdd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7bd1c1195998c10c732ccfa67c568e634d58166e)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Jana Radhakrishnan 651c53f020 Vendoring libnetwork @82fb373e3eaa4e
- Fixes a SNAT issue in loadbalancer when multiple networks are involved
  - Fixes an issue with SRV query forwarding in DNS
  - Fixes a map race

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 56c98226955d98a2ba6a99bffd3a9a80d691e4a7)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:43 -07:00
Dieter Reuter 64f62a6703 Improve systemd config for Raspbian
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 3c7ae431e08af7a53ebfe4fbb2eaf279fb3993b6)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:43 -07:00
Tibor Vass 460d8d80ca release-rpm: fix bad destination paths for rpms
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e1c7ad871f6fd41a7682cf7effb02838ab679ae3)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:43 -07:00
Sebastiaan van Stijn dd08342103 Add note about new binaries to changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 32b8a6e735ef674e1ea2415915e41531bcd4a9c8)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:42 -07:00
Dieter Reuter 07e0380379 Fix build deb for ARMv6
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 5907e4a872c7d586ab594972fa24bf4fa4e83207)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:42 -07:00
Sebastiaan van Stijn 0c369b1a5c Merge pull request #25761 from thaJeztah/update-changelog
Update 1.12.1 changelog for networking fixes
2016-08-16 21:51:27 +02:00
Sebastiaan van Stijn 6927a7b263
Update networking section in changelog
- Add 25550 to 1.12.1 changelog
- Add 25739 to 1.12.1 changelog

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-16 17:18:10 +02:00
Tibor Vass 8dae3ecff0 Merge pull request #25713 from thaJeztah/update-changelog
[1.12.1] Add removal of "--network-add" / "--network-rm" to changelog
2016-08-15 10:34:16 -07:00
Sebastiaan van Stijn 12ab1ca5eb
Add removal of "--network-add" / "--network-rm" to changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 14:31:39 +02:00
Tibor Vass 7889dc71a2 Bump VERSION to v1.12.1-rc1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-12 10:59:21 -07:00
Tibor Vass 705ebd6fac Merge pull request #25659 from thaJeztah/update-1.12.1-changelog
rewording and changes in 1.12.1 changelog for 1.12.1-GA
2016-08-12 10:58:41 -07:00
Sebastiaan van Stijn eae4ba51e5
Minor rewording and changes in 1.12.1 changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-12 18:15:14 +02:00
Tibor Vass e005053797 Merge pull request #25653 from tiborvass/i-hate-rpm
Changelog: Add placeholder date for 1.12.1
2016-08-12 01:36:22 -07:00
Tibor Vass 7646aba651 Changelog: Add placeholder date for 1.12.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-12 01:29:09 -07:00
Tibor Vass c4428f84d0 Merge pull request #25651 from tiborvass/changelog-1.12.1
Update CHANGELOG for 1.12.1
2016-08-12 00:14:37 -07:00
Tibor Vass 5680192346 Merge pull request #25632 from SvenDowideit/more-docs-1.12.1-cherry-picks
More docs 1.12.1 cherry picks
2016-08-12 00:14:30 -07:00
Tibor Vass a019407d3e Update CHANGELOG for 1.12.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 22:48:24 -07:00
Tibor Vass 5dc0715cd2 Merge pull request #25637 from tiborvass/cherry-picks-1.12.1
Cherry picks 1.12.1
2016-08-11 22:27:32 -07:00
Tibor Vass 235d897aaf Merge pull request #25647 from tiborvass/fix-network-flag-on-service-update-1.12.1
[1.12.1] Remove --network-add and --network-rm flags from service update
2016-08-11 21:08:40 -07:00
Santhosh Manohar 42fed93a89 Vendoring libnetwork for 1.12.1-rc1
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit b9c9fa2855cd5c7391cd026ef13a7d9d061214ee)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 20:26:04 -07:00
Anusha Ragunathan a3f2c03ef0 Fix deadlock on plugin shutdown.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 4d009084de8cad94a180130eb57efa2a98df6d98)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 19:40:06 -07:00