bcf7be1ed0
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: aadd88c306d43b401a18a29efafa714f64f87894
Component: engine
2016-06-16 11:52:34 -07:00
b088238272
Merge pull request #23609 from Microsoft/WindowsMemory
...
Windows: Re-enabled support for memory limit
Upstream-commit: 1f3efe67764b6f8616dd12271747863c17f36f30
Component: engine
2016-06-16 10:08:17 -07:00
b1012f71f3
Merge pull request #23568 from adrianmoisey/patch-1
...
Fix URL to issue
Upstream-commit: 3acb0e4292b23a30fd949e473ba798e2c343d869
Component: engine
2016-06-16 10:03:11 -07:00
7f85b4490c
Merge pull request #23623 from SvenDowideit/fix-rc-advisory
...
advisory can't be in the [menu] section
Upstream-commit: b62d5dfbf3cf1be01df376334ed9f896030c1bd1
Component: engine
2016-06-16 10:01:49 -07:00
c4c90efda6
Remove out-of-date health test
...
The test was waiting for the container to exit after failing its
healthcheck. However, we no longer automatically terminate containers,
so this waited instead for the container to time-out by itself.
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com >
Upstream-commit: 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8
Component: engine
2016-06-16 13:09:57 +01:00
e787e67ec5
advisory can't be in the [menu] section
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: bc033cb706fd22e3934968b0dfdf93da962e36a8
Component: engine
2016-06-16 11:59:47 +00:00
5445763ee1
Merge pull request #23583 from anusha-ragunathan/accept-perms
...
Add accept-permissions flag for install.
Upstream-commit: 6253c294947ef8ec64092bb612aafa45ff07f076
Component: engine
2016-06-16 12:44:37 +02:00
d1beb37828
Merge pull request #23612 from icecrime/default_parallelism
...
Service `--update-parallelism` defauls to 0
Upstream-commit: 0d8ad60e086aa48dd16fbae3bfdf842d3b974c5a
Component: engine
2016-06-16 12:32:30 +02:00
de87bc9acb
Merge pull request #23582 from tophj-ibm/fix-typo-in-daemon-test
...
Fix daemon test typo
Upstream-commit: e3ad63f7e44775335603ed23d34e1369eb2452b0
Component: engine
2016-06-16 05:22:50 +00:00
dea0c27b09
Merge pull request #23572 from tombee/volume-opts-typo
...
Change 'invald' to 'invalid' in volume opts errors
Upstream-commit: e65c5b603e71245ffb2c2630fe986865d4d70f46
Component: engine
2016-06-16 05:17:30 +00:00
32caa09adc
Merge pull request #23593 from justincormack/mlock
...
Move mlock back into the default ungated seccomp profile
Upstream-commit: 78d624cfcd29b26aaf25e9e929f54f24ce364341
Component: engine
2016-06-16 05:16:57 +00:00
99862c3f0b
Merge pull request #23603 from mlaventure/revert-runc-to-mainstream
...
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Upstream-commit: 9cdb6357e2f8c7561ba580c1e16de81d24e1de99
Component: engine
2016-06-16 05:08:44 +00:00
c6395cdf74
Merge pull request #23577 from anusha-ragunathan/strings_conversion
...
Avoid back and forth conversion between strings and bytes.
Upstream-commit: c18e036d36be09f5144ac99266a2b525cb79ce78
Component: engine
2016-06-15 21:41:04 -07:00
fc28f1b8ca
Merge pull request #23601 from dnephin/change_header
...
Change SCALE to REPLICAS.
Upstream-commit: 8ab79f1f7035288743882a6f0fa8bacc6c8454fa
Component: engine
2016-06-16 04:18:49 +00:00
8e989e5251
Service --update-parallelism defauls to 0
...
The `--update-parallelism` flaag should default to 0, which is
interpreted by the backend as unlimited. In other words, by default all
services should update simultaneously.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: f22d0174f33e084445c5845c95aca346e187fb02
Component: engine
2016-06-15 21:13:04 -07:00
9f6da823f0
Merge pull request #23558 from mlaventure/fix-arm-test-for-multiple-runtimes
...
Fix TestRunWithRuntime* on arm
Upstream-commit: 17bf13b1b2b44e0351218fd0b25d716687f0df32
Component: engine
2016-06-16 04:09:15 +00:00
1063457ce1
Merge pull request #23602 from crosbymichael/bump-libnetwork
...
Update libnetwork to 96d45528599c32354230480a1ebc0
Upstream-commit: 18a20c859f6fc9ad5aa51a0e281223b861aa8f62
Component: engine
2016-06-15 19:01:29 -07:00
cb9a8acf9f
fixing links and merge conflicts
...
updated link to faqs/troubleshoot to point to new location /toolbox
fixed docker-for-mac link error
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 1d80f8ca193139755de935fa6567a32734038cac
Component: engine
2016-06-15 18:37:50 -07:00
dd45c05df9
Merge pull request #23510 from sbose78/23376-update-centos-yum-repo-version
...
Fixes #23376 Broken URL for Centos yum repo for docker fixed to harcoded version number.
Upstream-commit: 0c78a7dd64c4c0b11aae040fadbecee2a7fdf5ae
Component: engine
2016-06-16 02:43:13 +02:00
66f02f955c
Windows: Added support for memory limit
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 12fe27a40893d92489996550ddff976eba50332c
Component: engine
2016-06-15 17:07:29 -07:00
d8d03043a3
Add basic integration tests for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a2d48c9e4e2abadcba582de47891837b0a80b24c
Component: engine
2016-06-15 15:19:19 -07:00
4a8d3f13a7
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b675124cf5fc96a6c329b5580ef60304089270c6
Component: engine
2016-06-15 15:11:50 -07:00
6a10bc5376
Update libnetwork to 96d45528599c32354230480a1ebc0
...
This fixes an issue with hanging tests due to store.
Fixes #23560
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e927df7b4b58099113b5086371b1d80ff517f564
Component: engine
2016-06-15 15:07:04 -07:00
93b2574efc
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
eb4a784598
Merge pull request #23565 from SvenDowideit/fix-links-tutorials
...
fix links for #23505
Upstream-commit: eab3a1fa553360d39d30e14e7f23cdc769dc4dc5
Component: engine
2016-06-15 21:24:22 +00:00
6afb0ba9c1
Move mlock back into the default ungated seccomp profile
...
Do not gate with CAP_IPC_LOCK as unprivileged use is now
allowed in Linux. This returns it to how it was in 1.11.
Fixes #23587
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: bdf01cf5deee11deb426eb33e1c8433c410084b6
Component: engine
2016-06-15 16:25:27 -04:00
a0153fe543
Merge pull request #23542 from mavenugo/aliases
...
Use service alias and configure service VIP or dns-rr
Upstream-commit: 011774e6f0eb5db13fb084b2b8d4d499a9f0548b
Component: engine
2016-06-15 16:18:50 -04:00
407690e430
Merge pull request #23579 from tonistiigi/fix-ci-hang
...
Fix hanging integration tests
Upstream-commit: 8510adf8c856d6f0871650216a0e1d7e6ece46ee
Component: engine
2016-06-15 14:49:54 -04:00
dbd95f4e51
Add accept-permissions flag for install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: ec4857da485768db8dadda3511122d136d896dde
Component: engine
2016-06-15 10:58:43 -07:00
abaa81f006
Merge pull request #23538 from anusha-ragunathan/incremental-builds
...
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
Upstream-commit: 64eb01caf6490b57163e55588bcf295d9645fdae
Component: engine
2016-06-15 10:53:31 -07:00
25c9453aac
Fix test typo
...
Changes daemn to daemon
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 51c0c6212d66ff940940e0a2c9393cfffafa5ee5
Component: engine
2016-06-15 13:45:25 -04:00
85aba87fc8
Fix hanging integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 22f827ababc1910bc48762d7980913497dbc915d
Component: engine
2016-06-15 10:19:45 -07:00
52c1999aed
Merge pull request #23301 from runcom/tmpfs-trump
...
daemon: allow tmpfs to trump over VOLUME(s)
Upstream-commit: 480d7b310b2b063621eb260aff34e34171694ae3
Component: engine
2016-06-15 17:11:00 +00:00
c6bff6e7a4
Avoid back and forth conversion between strings and bytes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d6d448aab8e303a351b763f6a77b909fadb7344b
Component: engine
2016-06-15 09:55:40 -07:00
f6a61ade82
Change 'invald' to 'invalid' in volume opts errors
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
Upstream-commit: bf988fc6ff90e1477d3fdab79cc7239511f32aba
Component: engine
2016-06-15 15:41:57 +01:00
eb2bdeb9cf
daemon: allow tmpfs to trump over VOLUME(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 756f6cef4a1379e59d6511ee000e435d23659153
Component: engine
2016-06-15 16:01:51 +02:00
c845c179d8
Merge pull request #23557 from AkihiroSuda/fix-exp-doc
...
Update experimental/README.md
Upstream-commit: b6a8a3da10698a43043b752552228eed71955994
Component: engine
2016-06-15 13:34:25 +02:00
b8f519a5bd
Fix URL to issue
...
Signed-off-by: Adrian Moisey <adrian@changeover.za.net >
Upstream-commit: 88d4da7f422a4ac341efa85541271b1c0e9bcfa3
Component: engine
2016-06-15 12:49:04 +02:00
b13c0385b8
Update experimental/README.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: fec98ecca1d82ec1f2e0bd4d5e2c180ef834dc52
Component: engine
2016-06-15 19:14:51 +09:00
02e6cd83ac
Merge pull request #23322 from tkopczynski/20784-builder-dockerfile-symlink
...
Reimplement integration test for symlink Dockerfile as a unit test
Upstream-commit: e08aed59dfd1642ae04ac4eb1055a378d6a572c1
Component: engine
2016-06-15 10:52:49 +02:00
965831ca81
fix links for #23505
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fa94eb46041ad309468dbbd29faba2053f402096
Component: engine
2016-06-15 04:46:40 +00:00
a15b623c8b
Merge pull request #23505 from londoncalling/add-getstarted-tutorial
...
ready for merge: surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: da159235595359024ecb63332538c6696f7eb49e
Component: engine
2016-06-15 14:18:09 +10:00
8fead059d3
surfacing Learn by example topics to top level of Docker Engine docs
...
fixing links after moving surfacing tutorials
fixing more links for the newly located tutorials
WIP: merging 3 getting started tutorials into one to cover all platforms, added new files
fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 0254c12e1e0be7a93e3b28e61586ac66168a9b7c
Component: engine
2016-06-14 21:08:44 -07:00
5710cba08b
Merge pull request #23555 from dperny/change-manager-status-col
...
Remove the node leader column, show leader as status.
Upstream-commit: 8821233282c187551213497f66248e42de02b167
Component: engine
2016-06-15 03:55:12 +00:00
1de46d8dd4
Bump API Version to v1.25
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 04292192e023372453983cf6318f772922928c4e
Component: engine
2016-06-14 20:03:50 -07:00
e306e601d2
Use service alias and configure container's --net-alias
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f
Component: engine
2016-06-14 19:50:34 -07:00
efcb8ab316
Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5af8e2a9c08439049da9a9abc24145c3d1f2e9de
Component: engine
2016-06-14 19:50:34 -07:00
241219195c
Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f2f97f768e51f817336cd56456158bc32ab3b977
Component: engine
2016-06-14 19:50:34 -07:00
f5c8d86b39
Merge pull request #23554 from vieux/node_update_name
...
fix docker node update via name
Upstream-commit: 9ba0504923879f65d880e3c928c3964d8cbefc6c
Component: engine
2016-06-15 02:36:42 +00:00
09430f24ff
Merge pull request #23553 from icecrime/heartbeat_as_duration
...
Make `--dispatcher-heartbeat-period` a duration
Upstream-commit: 2e9aac59e20ee376da32c5c85e1b392fc555f9c9
Component: engine
2016-06-15 02:36:17 +00:00
