Commit graph

31425 commits

Author SHA1 Message Date
Sebastiaan van Stijn
f57d3454ca
Remove unused filter param from Swagger
Commit 745795ef2e added a `filter`
query-parameter to all "prune" endpoints, however the parameter was only used
when pruning images.

This patch removes the filter parameter from the volume-prune endpoint, given
that it is not used there, so there is no reason documenting it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-05-04 14:32:13 -07:00
Victor Vieux
b33bbc79b6 Merge pull request #32583 from mstanleyjones/fix_yaml_script
docs: fix Makefile for yaml docs generation
2017-04-12 16:46:36 -07:00
Tibor Vass
50e1a16e39 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>
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-12 16:44:55 -07:00
Misty Stanley-Jones
f14702ba86 Merge pull request #32569 from mstanleyjones/1704_cherrypicks
Standardized formatting of CLI reference commands
2017-04-12 15:26:53 -07:00
Sebastiaan van Stijn
639112b091 Merge pull request #32282 from mstanleyjones/improve-attach-desc
Clarify meaning of docker attach
(cherry picked from commit 571e403168)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-12 14:48:12 -07:00
Misty Stanley-Jones
abfd780ba3 Standardized formatting of CLI reference commands
Command name should be a H1

Only Description, Examples, and Related Commands should be H2

Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands

Added some examples where relevant

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 52df69f00d)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-12 12:27:37 -07:00
Victor Vieux
bbbeed1e0c Merge pull request #32431 from thaJeztah/17.04.x-cherry-pick-32425
[17.04.x] cherry-pick 32425 - fix install.sh of get.docker.com for debian-sudo
2017-04-07 16:37:26 -07:00
Vincent Demeester
b8e03f9e70
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 10:59:14 +02:00
Victor Vieux
e95f64d4f9 Merge pull request #32319 from thaJeztah/17.04.0-docs-cherry-picks
[17.04.x] docs cherry picks
2017-04-03 11:48:13 -07:00
Victor Vieux
4845c567eb bump to 17.04.0 GA
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-03 10:15:25 -07:00
Sebastiaan van Stijn
b341c80644
Merge pull request #32304 from thaJeztah/master-cherry-pick-32265
[master] cherry-pick Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit 2347020706)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:39:19 +02:00
Aaron Lehmann
1b91555700
Merge pull request #32200 from yuexiao-wang/update-usage
fix inconsistency for docker service ps
(cherry picked from commit 278b36e5ce)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:39:08 +02:00
Vincent Demeester
7ec084a742
Merge pull request #32199 from yuexiao-wang/add-examples
provide `docker stack ps` examples
(cherry picked from commit 36c2f2731d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:38:58 +02:00
Sebastiaan van Stijn
6e58fd8710
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 16:38:43 +02:00
Vincent Demeester
6a7164ad33
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 16:35:26 +02:00
Sebastiaan van Stijn
a81b14a5d7
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 16:35:17 +02:00
John Howard
5584897f59
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 16:35:06 +02:00
Vincent Demeester
f4da7448ee
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 16:34:57 +02:00
Sebastiaan van Stijn
b8673671ef
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 16:34:42 +02:00
Sebastiaan van Stijn
dcaf5334ab
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 16:34:32 +02:00
Victor Vieux
338e7a0b60
Merge pull request #31902 from thaJeztah/master-cherry-pick-31875
cherry-pick 31875 - update service-create.md
(cherry picked from commit f148ad38e5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:34:20 +02:00
Sebastiaan van Stijn
76a0c400d8
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 16:34:11 +02:00
Sebastiaan van Stijn
a95e8154e8
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 16:33:58 +02:00
Vincent Demeester
aad95ccba9
Merge pull request #31749 from yallop/docs-31047
Add documentation for bind mount consistency flags (#31047).
(cherry picked from commit 94394026a8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:33:41 +02:00
Sebastiaan van Stijn
21d5e8ba4f
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 16:32:05 +02:00
Sebastiaan van Stijn
1ea62f8807
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 16:31:24 +02:00
Vincent Demeester
fcf640efce
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 16:21:25 +02:00
Victor Vieux
30686111ad 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:47:04 -07:00
Victor Vieux
2f35d73b7d bump to rc2
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-29 00:16:40 -07:00
Victor Vieux
d408b829fb Merge pull request #32190 from vieux/cherry-picks-17.04-rc2
cherry picks 17.04.0-rc2
2017-03-28 23:50:27 -07:00
Tonis Tiigi
164f1d362e Return proper exit code on builder panic
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 385f1174ff)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:34:11 -07:00
French Ben
b82fe694d4 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: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:29:36 -07:00
Jim Minter
9c05b1049f Resolve connection reset by peer regression
Signed-off-by: Jim Minter <jminter@redhat.com>
(cherry picked from commit dc0ee98805)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:26:22 -07:00
Vincent Demeester
fbd3d64212 Replace API version comparison by a if
… as we don't know for sure what API version it will be at that time.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 0f9d22cd66)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:26:12 -07:00
Victor Vieux
c97450059d Revert "Planned 1.13 deprecation: email from login"
This reverts commit a66efbddb8.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 4bce232139)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:26:02 -07:00
Sebastiaan van Stijn
81075fa86c update "docker daemon" deprecation message for new version scheme
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ba76a0c912)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:24:53 -07:00
Steve Durrheimer
76c8cbd1fc Add zsh completion for 'docker build --add-host'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit fbedc588be)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:24:44 -07:00
Manjunath A Kumatagi
62581bb11c Fix Healthcheck API doc
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
(cherry picked from commit 4df54695ef)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:24:35 -07:00
Vincent Demeester
101369979a Add cli reference docs for root-level commands
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 9cea26bc77)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:24:23 -07:00
Vincent Demeester
b721d55399 Set the alias to the service name instead of the network name
This makes it work a little closer to compose part and it is more
correct 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit ee08c8542a)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:24:07 -07:00
Darren Stahl
6ddedae595 Windows:Revert change to wait for OOBE
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 6eed7f0cac)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:23:58 -07:00
Victor Vieux
73b512220d Merge pull request #31977 from cyli/bump-go-connections-17.04
Bump go connections for 17.04 and use either system pool or custom CA pool when connecting from client->daemon [17.04]
2017-03-23 17:07:28 -07:00
Victor Vieux
5550606c15 Merge pull request #32033 from AkihiroSuda/cherrypick-30781
[17.04] compose: fix environment interpolation from the client
2017-03-23 10:10:42 -07:00
Akihiro Suda
fac9e24c7c compose: update the comment about MappingWithEquals
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-23 02:09:26 +00:00
Daniel Nephin
7a4482a144 Fix environment resolving.
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-23 02:09:26 +00:00
Akihiro Suda
88c18fb45c compose: fix environment interpolation from the client
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-23 02:09:26 +00:00
Sebastiaan van Stijn
94c4b33730 Merge pull request #31970 from vdemeester/cherry-pick-31621
[17.04] Cherry-pick: Windows: Fix Docker hanging with named pipes and stdin
2017-03-21 21:20:49 +01:00
Ying Li
60d17202f0 Use either the system root pool or an empty cert pool with custom CA roots,
and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon

Signed-off-by: Ying Li <ying.li@docker.com>
2017-03-21 10:54:56 -07:00
Ying Li
3c05ff4aef Bump the version of go-connections
Signed-off-by: Ying Li <ying.li@docker.com>
2017-03-21 10:40:39 -07:00
David Gageot
f3cc477e7d Windows: Fix Docker hanging with named pipes and stdin
Fixes #31922

Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43)
merged


Signed-off-by: David Gageot <david@gageot.net>
2017-03-21 16:13:41 +01:00