Aaron Lehmann
472485ea93
Vendor swarmkit 2591ac3
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-16 12:06:06 -07:00
Sebastiaan van Stijn
d33342725b
Merge pull request #33207 from cpuguy83/cherry_pick_mpsec_backport
...
[17.03] Fix issue backporting mount spec to pre-1.13 obj
2017-05-16 01:03:32 +02:00
Brian Goff
d772750271
Fix issue backporting mount spec to pre-1.13 obj
...
In some cases a mount spec would not be properly backported which could
lead to accidental removal of the underlying volume on container remove
(which should never happen with named volumes).
Adds unit tests for this as well. Unfortunately I had to add a daemon
depdency for the backport function due to looking up `VolumesFrom`
specs.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 3cf18596e9
2017-05-15 15:53:19 -04:00
Victor Vieux
696df0376f
Merge pull request #33118 from aaronlehmann/vendor-swarmkit-e680722
...
[17.03] Vendor swarmkit e680722
2017-05-10 10:37:43 -07:00
Victor Vieux
4843bdced5
Merge pull request #33120 from cpuguy83/backport_lazy-unmount-volume
...
[17.03.x] Backport lazy unmount volume
2017-05-10 10:37:24 -07:00
Sebastiaan van Stijn
7f394b8b35
Merge pull request #33117 from aaronlehmann/digest-pin-context-17.03
...
[17.03.2] cluster: Renew the context after communicating with the registry
2017-05-10 15:45:27 +02:00
Brian Goff
2dfb31c228
Use lazy unmount for local volume unmount
...
This is a spiritual backport of acbfe6bc56
2017-05-09 14:17:10 -04:00
Brian Goff
6aac9ab3c7
Ensure unmount before removing local volume.
...
When there is an error unmounting a local volume, it is still possible
to call `Remove()` on the volume causing removal of the mounted
resources which is generally not desirable.
This ensures that resources are unmounted before attempting removal.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db3576f8a0
2017-05-09 13:48:45 -04:00
Aaron Lehmann
387707f03e
Vendor swarmkit e68072200ebbba6ce9745b3a3e49fdba3eb71ff8
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-09 10:25:27 -07:00
Brian Goff
1bf3b68a4b
Merge pull request #33028 from thaJeztah/17.03-remove-unused-filter-param
...
[17.03.x] Remove unused filter params from Swagger
2017-05-05 09:25:12 -04:00
Sebastiaan van Stijn
2bdaab759f
Remove unused filter params from Swagger
...
Commit 745795ef2e
2017-05-04 14:29:36 -07:00
Doug Davis
9db03bd8cd
Merge pull request #32804 from bbodenmiller/patch-1
...
remove extra word
2017-04-28 18:39:52 -04:00
Ben Bodenmiller
9ed258872a
remove extra word
...
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2017-04-28 15:37:48 -07:00
Vincent Demeester
c3fbca1065
Merge pull request #32724 from PatrickLang/patricklang-win-memory
...
Adding more on -m and --memory
2017-04-26 15:30:09 +02:00
Patrick Lang
f93270a4bb
Adding description for -m, --memory
...
Signed-off-by: Patrick Lang <patrick.lang@hotmail.com>
2017-04-25 14:32:02 -07:00
Sebastiaan van Stijn
f2fff9d913
Merge pull request #32735 from bhavin192/patch-1
...
Add note about host-dir in VOLUME
2017-04-25 10:18:16 -07:00
Brian Goff
32a52716b9
Merge pull request #32791 from djalal/patch-1
...
fix typo
2017-04-24 08:53:30 -04:00
djalal
388ec67426
fix typo
...
Signed-off-by: djalal <contact@enlamp.com>
2017-04-24 14:33:49 +02:00
Tõnis Tiigi
8310663377
Merge pull request #32684 from scjane/patch-3
...
Update builder.md
2017-04-20 20:11:26 -07:00
Wang Jie
9b78660ef4
Update builder.md
...
Fix a invalid link.
Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-20 21:45:35 -05:00
Misty Stanley-Jones
4f769c6bc1
Edits and fixing note stacking
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-20 09:28:01 -07:00
Bhavin Gandhi
b9fe386870
Add note about host-dir in VOLUME
...
Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
2017-04-20 06:58:23 +00:00
Brian Goff
345fc1bed7
Merge pull request #32432 from thaJeztah/17.03.x-update-install-script
...
[17.03.x] update get.docker.com install script
2017-04-08 15:14:59 -04:00
Alexander Morozov
e2d541585f
Merge pull request #30067 from tophj-ibm/add-more-detailed-install-script-message
...
add suggestions in failure message in install script
(cherry picked from commit 002312d6c1
2017-04-07 11:20:35 +02:00
Vincent Demeester
8de0ced471
Merge pull request #32425 from tabakhase/patch-1
...
Fix install.sh of get.docker.com for debian-sudo
(cherry picked from commit daaf9ddfa9
2017-04-07 11:15:49 +02:00
Michael Crosby
af72a358fc
Merge pull request #29967 from justincormack/gpg-include-keys
...
Do not use keyservers to fetch GPG keys for apt
(cherry picked from commit 518945b6bd
2017-04-07 11:15:41 +02:00
Vincent Demeester
99d1e7f5b6
Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group
...
Don't encourage adding user to docker group
(cherry picked from commit 06e3812b6e
2017-04-07 11:11:17 +02:00
Sebastiaan van Stijn
ebcd590a03
Merge pull request #32390 from thaJeztah/fixup-docs-cherry-pick
...
[17.03.x] cli reference fixes
2017-04-06 01:37:45 +02:00
Sebastiaan van Stijn
7b29c9a4ce
Fix docs cherry-pick
...
commit d7bc6e4e7c
2017-04-06 01:07:46 +02:00
Victor Vieux
c79660699b
Merge pull request #32322 from thaJeztah/17.03.1-cherry-picks
...
[17.03.x] docs cherry picks
2017-04-03 11:47:53 -07:00
Victor Vieux
bcb63f3677
Merge pull request #32298 from thaJeztah/fix-changelog
...
[17.03.x] fix version of containerd in changelog
2017-04-03 11:45:50 -07:00
Sebastiaan van Stijn
9c3b01cbb3
Merge pull request #32183 from JimGalasyn/delete-h1
...
Delete extraneous H1 title
(cherry picked from commit 0c59283fc3
2017-04-03 17:11:55 +02:00
Vincent Demeester
a024e2ad6a
Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc
...
Updated push.md with progress bar info
(cherry picked from commit a048e131be
2017-04-03 17:11:50 +02:00
Sebastiaan van Stijn
6421a8d8c8
Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated
...
Fix indenting in deprecated engine features toc
(cherry picked from commit 0f8a3dafa4
2017-04-03 17:11:45 +02:00
John Howard
861311f17d
Merge pull request #31980 from JohnMaguire/doc-update
...
Add note regarding Windows VOLUME limitations
(cherry picked from commit c33c457852
2017-04-03 17:11:39 +02:00
Vincent Demeester
70faa0801c
Merge pull request #31973 from wsong/update_df_docs
...
Update system df docs to call out performance implications
(cherry picked from commit f453412bd8
2017-04-03 17:11:34 +02:00
Sebastiaan van Stijn
44a975201b
Merge pull request #31969 from vdemeester/fix-images-reference-docs-filter-list
...
Add `reference` filter to the list of available filters
(cherry picked from commit 4c7941d391
2017-04-03 17:11:29 +02:00
Sebastiaan van Stijn
da722663b7
Merge pull request #31911 from allencloud/specify-max-size-for-secret-in-doc
...
specify max size for secret in doc
(cherry picked from commit 7c7cc0bbdc
2017-04-03 17:11:22 +02:00
Sebastiaan van Stijn
311c465578
Merge pull request #31901 from davidxia/fix-docs
...
[docs] Fix incorrect `docker inspect` example
(cherry picked from commit b385a9156e
2017-04-03 17:11:17 +02:00
Sebastiaan van Stijn
3006a837d5
Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
...
docs: remove outdated reference to updating /etc/hosts(cherry picked from commit 5126862d43
2017-04-03 17:11:11 +02:00
Sebastiaan van Stijn
f4f8e9481f
Merge pull request #31619 from rcjsuen/patch-1
...
Fix typo in sample output
(cherry picked from commit aa534d3bb2
2017-04-03 17:11:06 +02:00
Sebastiaan van Stijn
4e5b668b1c
Merge pull request #31596 from rootsongjc/dry-run-test
...
Wrong entrypoint in docker plugin example
(cherry picked from commit 0bc84fc06c
2017-04-03 17:10:59 +02:00
Vincent Demeester
4fdfe3af0b
Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental
...
Update docs for experimental features
(cherry picked from commit bd811aa4fd
2017-04-03 17:09:36 +02:00
Sebastiaan van Stijn
039fb56e63
Merge pull request #32126 from vdemeester/docs-ref-cli-root-commands
...
Add cli reference docs for root-level commands
(cherry picked from commit cf113faca6
2017-04-03 17:05:03 +02:00
Sebastiaan van Stijn
c812008e82
Merge pull request #32107 from mkumatag/fix_api_doc
...
Fix Healthcheck API doc
(cherry picked from commit abecc530ee
2017-04-03 17:04:56 +02:00
Sebastiaan van Stijn
d9d2691146
Merge pull request #31641 from amatsus/master
...
Fix typo in CHANGELOG.md
(cherry picked from commit 58e787602d
2017-04-03 17:04:50 +02:00
Tibor Vass
1be1fd6a8c
Merge pull request #31496 from vieux/update_deprecation
...
update deprecation dates
(cherry picked from commit 0ab40a7552
2017-04-03 17:04:44 +02:00
Vincent Demeester
8e45d27673
Merge pull request #32191 from tiborvass/yaml-docs-gen-17_03
...
[17.03] docs: added support for CLI yaml file generation
2017-04-03 17:04:38 +02:00
Vincent Demeester
7d81f815b7
Merge pull request #31480 from thaJeztah/carry-31213-update-experimental-index
...
[carry 31213] Update index.md
(cherry picked from commit 6361117b59
2017-04-03 17:04:37 +02:00
Sebastiaan van Stijn
80c609504f
Merge pull request #31396 from kevinfeyrer/patch-2
...
Update vlan-networks.md
(cherry picked from commit 705e031b98
2017-04-03 17:04:24 +02:00
