Commit graph

29742 commits

Author SHA1 Message Date
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
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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
brought in markup fixes in the documentation, but
due to it being cherry-picked from "master", brought
in more changes that are not yet part of the
17.03 release.

This removes the features that are not in
the 17.03 release from the reference docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:04:24 +02:00
Brian Goff
e4f216c4fe
Merge pull request #30568 from khudgins/nimbleplugin
added listing for Nimble Storage's volume plugin
(cherry picked from commit ba5c0f88d5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:02:31 +02:00
Sebastiaan van Stijn
177fc19358
fix version of containerd in changelog
containerd was updated twice between docker 17.03.0
and 17.03.1; once in
74c52a7bab, and
again in 00132cc442,
but only the first change was included in the
changelog.

This updates the changelog to match what actually
shipped with 17.03.1.

Thanks to Stanislav Zubov for reporting.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-01 15:10:47 +02:00
Sebastiaan van Stijn
d0057bd12d Merge pull request #32265 from breuner/patch-1
Updated legacy_plugins.md to include BeeGFS plugin
2017-03-31 17:59:33 +02:00
Sven Breuner
35c5eaf80e Updated legacy_plugins.md to include BeeGFS plugin
Signed-off-by: Sven Breuner <sven.breuner@thinkparq.com>
2017-03-31 17:14:26 +02:00
Tibor Vass
4d6f64da09 docs: fix Makefile for yaml docs generation
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 36bd288162)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-29 15:19:20 -07:00
Victor Vieux
f89896dd09 install: map debian_version 9.X to debian stretch without lsb_release
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit f8360d002d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-29 13:46:37 -07:00
French Ben
43e3b8d2cc docs: added support for CLI yaml file generation
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5443f0152f)
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-28 17:41:46 -07:00
Victor Vieux
c6d412e329 bump version to 17.03.1
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-23 16:07:51 -07:00
Misty Stanley-Jones
0f1ee84014 Merge pull request #31875 from toolchainX/patch-2
update service-create.md
2017-03-16 14:17:38 -07:00
Linhua Tan
72ed80a82a update service-create.md
typo

Signed-off-by: 谭林华 <linhua.tlh@alibaba-inc.com>
2017-03-16 17:25:58 +08:00
Victor Vieux
3476dbfb36 Merge pull request #31852 from mlaventure/update-containerd-17.03
[17.03.1] Update containerd to version 4ab9917febca54791c5f071a9d1f404867857fcc
2017-03-15 10:49:52 -07:00
Kenfe-Mickael Laventure
00132cc442 Update containerd to version 4ab9917febca54791c5f071a9d1f404867857fcc
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-15 08:16:07 -07:00
Victor Vieux
59c6eb8c2f Merge pull request #31754 from vieux/bump_17.03.1
bump to 17.03.1-rc1
2017-03-13 23:25:41 -07:00
Victor Vieux
fe47f34b54 bump tp 17.03.1
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:20 -07:00
Misty Stanley-Jones
1313d424eb Fix markdown in references for Kramdown
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 0ce13eb0d3)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:20 -07:00
Yong Tang
c73e4dedbd Fix issue where service healthcheck is {} in remote API
This fix tries to address the issue raised in 30178 where
service healthcheck is `{}` in remote API will result in
dns resolve failue.

The reason was that when service healthcheck is `{}`,
service binding was not done.

This fix fixes the issue.

An integration test has been added.

This fix fixes 30178.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 8feb5c5a48)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:19 -07:00
Harald Albers
17c6fa06f6 Improve POSIX compatibility of bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 76f4681b56)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:19 -07:00
Harald Albers
a3fa6aa153 Improve bash completion for docker run --cap-{add,drop}
Docker has several capabilities enabled by default and some not.
It seems natural to follow this distinction in --cap-add and
--cap-drop.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 36d8b66cb9)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:19 -07:00
Tonis Tiigi
8953fda3ef overlay2: fix unmounting layer without merge dir
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e1af6c8a57)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:19 -07:00
Daniel Nephin
bc8f9c8249 Support customizing the default network for a stack.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit b7577dd2ad)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:19 -07:00
yuexiao-wang
a3c0c6d03b 'docker daemon' deprecation message doesn't use the new versioning scheme
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 5a9cee7bb5)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-13 21:21:19 -07:00