9c6798de6b
Add network interal mode
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b70954e60a15d09756bd6b00a6fadedc64829477
Component: engine
2016-01-13 11:30:36 -05:00
69c1610f93
Merge pull request #19249 from calavera/carry_17414
...
[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
2016-01-13 10:42:22 +01:00
b2c9225704
Merge pull request #19229 from mavenugo/udlinks
...
Local alias support
Upstream-commit: 47d87d3b92e349608e080f15035d8485af7254c5
Component: engine
2016-01-12 16:47:32 -08:00
a4e709fac0
Complete documentation about extra container information.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: e5edc168a65e038245efbc5353a456302554f4eb
Component: engine
2016-01-12 18:16:58 -05:00
296e59632a
Merge pull request #19170 from aaronlehmann/delete-prune-digests
...
Prune digest references when deleting by tag
Upstream-commit: c0c66c57b2d898e43f7dd74ad9f2f256ea5dfcdf
Component: engine
2016-01-12 15:15:36 -08:00
6e46b2fdf4
Docs update for link functionality in user-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2aa5f33b20881d3d5e7f412ff946f83f33cde810
Component: engine
2016-01-12 13:38:48 -08:00
eb73b224c4
Prune digest references when deleting by tag
...
When pulling an image with content trust enabled, two references are
created: a digest reference and a tag reference. Deleting by tag
wouldn't actually remove the image, because the digest reference keeps
it alive.
This change modifies the rmi logic so that digest references don't keep
an image alive. If the last tag referencing a given image is deleted,
any digest references to it will be removed as well, so the image can
actually get deleted. This fixes the usability problem with deletions
when content trust is in use, so something like "docker pull busybox;
docker rmi busybox" will work as expected.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2f048f73e122ab90b8f35a088b4be52bd255caad
Component: engine
2016-01-12 12:11:43 -08:00
41680fdf37
Merge pull request #19104 from vdemeester/18957-update-config
...
Add a specific config struct for the update command (#18957 )
Upstream-commit: 1393c450cd8b4b7143a069ac062fd2adc6e02ca0
Component: engine
2016-01-12 09:46:19 -08:00
4a64d99bbc
Merge pull request #19187 from estesp/lets-do-this
...
User namespaces: graduate from experimental
Upstream-commit: c72be040bb893e49bb12baf7e688c88b635d8ea1
Component: engine
2016-01-12 09:34:19 -08:00
e2b2a71502
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
62a5091381
Add a specific config for the update command
...
This allows to define clearly what is mutable or not in a container
and remove the use of the internal HostConfig struct to be used.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a4f6920731c6af27a7e89c3da8d0e6fd309de90a
Component: engine
2016-01-12 08:33:41 +01:00
cae7fb6550
Add daemon documentation on user namespaces feature
...
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: cc63db4fd19f99372a84cc97a87a023fa9193734
Component: engine
2016-01-11 20:54:57 -05:00
3340505b84
Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port
...
Fix ambassador script
Upstream-commit: 3f1b16e236ad4626e02f3da4643023454d7dbb3f
Component: engine
2016-01-11 17:41:53 -08:00
e46c089f56
Merge pull request #18998 from calavera/syslog_tls
...
Allow syslog over TCP+TLS.
Upstream-commit: 656979670c5225753ad8d0c6d2bb1ab1a82b0b56
Component: engine
2016-01-11 17:21:38 -08:00
3b26d1d1d4
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
35f8dfbc72
List engine-api in the client libraries reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: bce01398dda39e551a39f287224189f70accaf80
Component: engine
2016-01-11 19:17:13 -05:00
aa00140122
Added additional container information to "docker info".
...
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.
Signed-off-by: Kim Eik <kim@heldig.org >
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
Upstream-commit: e732f4e649a3420eab3b6541dacbefe3cf00719a
Component: engine
2016-01-11 19:14:44 -05:00
1c0d76c749
Add support for syslog over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4b98193beab00bc6cf48762858570a1bd418c9ef
Component: engine
2016-01-11 12:25:34 -05:00
7e3ab3dcd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
Upstream-commit: fe3d1f9dd7f2c888ad69034464cba6a35a56018f
Component: engine
2016-01-10 11:46:34 -08:00
b9cea74caa
Merge pull request #19171 from londoncalling/cloud-installs-redirects
...
added re-directs for cloud install docs as clean-up for #18282
Upstream-commit: 7058495ab8bd358e11e1b06eb90298a0a207d7c5
Component: engine
2016-01-09 17:43:41 -08:00
a478ae86ba
Merge pull request #19167 from vieux/bring_discovery_on_par
...
Bring discovery on par with the one in docker/swarm
Upstream-commit: c49ccd319249610eb05f0c430b26d7c82383bf76
Component: engine
2016-01-08 22:54:01 -08:00
d8dc8b7d33
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
2016-01-08 14:13:55 -08:00
7ad15b069e
Fix ambassador script based on SvenDowideit/dockerfiles#37
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: cc44ea21e481d34ab9621afd6944b6c14a23106a
Component: engine
2016-01-08 20:55:22 +00:00
7467c1af44
Allow user to choose the IP address for the container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
6ac9b9caaf
Merge pull request #19165 from shishir-a412ed/man_page_fix
...
man page fix: remove -e/--exec-drive=native related description
Upstream-commit: 6213cc9d0476ee43bc92e554f4775e33c3c4d38f
Component: engine
2016-01-07 16:47:07 -08:00
edc9578a83
Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
...
Update storage docs for content-addressability
Upstream-commit: b12ef0fe00245ca549be5822d8b26033b59cff7a
Component: engine
2016-01-07 16:44:29 -08:00
72bafe062f
added re-directs for cloud install docs as clean-up for #18282
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 2ffb362f9bbfea5ac72ebe11c5692f129eb8ccd2
Component: engine
2016-01-07 16:06:46 -08:00
5831ef280d
man page fix: remove -e/--exec-drive=native related description
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 50305d66f56774488b6fec2534fd592c263c91e0
Component: engine
2016-01-07 14:21:01 -05:00
183cea761e
Merge pull request #19059 from jfrazelle/seccomp-docs
...
add syscalls we purposely block to docs
Upstream-commit: cceac7da358c3e25130ce851312c44dd4418c1b2
Component: engine
2016-01-07 11:13:07 -08:00
6a1af5c70c
Merge pull request #19144 from LK4D4/fix_parent_systemd
...
Choose default-cgroup parent by cgroup driver
Upstream-commit: 938d28e772ec32ed3b09bfb8907852e497990076
Component: engine
2016-01-07 10:24:51 -08:00
4db7c3289b
add syscalls we purposely block to docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 52f32818df8bad647e4c331878fa44317e724939
Component: engine
2016-01-07 10:22:16 -08:00
d19e17505e
Merge pull request #19156 from HackToday/19152-fix-voldoc
...
Remove the old reference link
Upstream-commit: 374a9596b22819ddcb1a981ea05a8ba3f4d4f0ed
Component: engine
2016-01-07 09:21:58 -08:00
d9a92e1dc3
Choose default-cgroup parent by cgroup driver
...
It's "/docker" for cgroupfs and "system.slice" for systemd.
Fix #19140
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c1cd45d547ef26cf988dc72d456430361dafcf08
Component: engine
2016-01-07 08:56:26 -08:00
c4d25ca65c
added documentation for groupadd within hostConfig that was added in remote api 1.20
...
Signed-off-by: Oliver Neal <ItsVeryWindy@users.noreply.github.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ade71ace7df285795381d1317f8069f14e099bb3
Component: engine
2016-01-07 12:30:27 +01:00
33bcd44d7d
Remove the old reference link
...
Fixes : #19152
As issue #14214 closed, so this old link is not needed.
We can remove it now.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: ca7b69016a13739db74eb09046d8344762a2caa4
Component: engine
2016-01-07 10:23:36 +00:00
25ac09e895
Merge pull request #19090 from thaJeztah/fix-api-markdown
...
fix markdown and typos in API docs
Upstream-commit: 3442339b98dccc7137ea8d49393eff44166a67ec
Component: engine
2016-01-07 08:32:01 +01:00
3e3964af2f
Merge pull request #19115 from cpuguy83/volume_plugin_docs_change.md
...
Add docs for volume plugin ls/get
Upstream-commit: af6c6dbf8748b0e09d48a788cb17cb6d3c30c7a4
Component: engine
2016-01-06 20:04:09 -08:00
11307815af
Add docs for volume plugin ls/get
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5d1dd8069bd8217f946da531c2575280a68bc085
Component: engine
2016-01-06 12:42:44 -05:00
0cad98a56c
Add -f flag to cURL install instructions
...
From the -f description:
(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
2016-01-06 16:05:16 +01:00
e860be63e2
Before that change, etcd and zookeeper would fail to instantiate
...
the discovery without the key being already there in the store or
created beforehand and implicitely by a 'swarm join'.
Signed-off-by: Alexandre Beslic <abronan@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
This PR allows to configure the discovery path using the
--discovery-opt flag (with "kv.path=path/to/nodes"). We
can point to "docker/nodes" and use the docker discovery.
If docker instances are advertising to the cluster using
the `--cluster-advertise` flag, the swarm join command
becomes unnecessary.
Signed-off-by: Alexandre Beslic <abronan@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: a931c78540bdecbbe13302ec5156ef832e152994
Component: engine
2016-01-06 05:18:52 -08:00
1dce35922d
Merge pull request #19056 from clintonskitson/docs-rexray_update
...
Updated docs for consolidated list of REX-Ray providers
Upstream-commit: 7a15586f4fb4d5482b35fc00d1506ea8b36d2b10
Component: engine
2016-01-05 23:53:27 +01:00
3906315c1f
Merge pull request #19077 from AvdN/patch-2
...
example cannot work, pip needs --requirement
Upstream-commit: d9a38126562906381ac6829c4b49d1054e615dc6
Component: engine
2016-01-05 23:50:52 +01:00
caf108c7a2
Merge pull request #19045 from wenchma/network_api_update
...
Update docker network api doc
Upstream-commit: 180ff8d5015d60f1d1d7c9838d476ca5e4fc6117
Component: engine
2016-01-05 10:55:56 -08:00
7f8bab011e
Merge pull request #19051 from thaJeztah/dont-touch-var-lib-volumes
...
docs: add note to volume-plugins
Upstream-commit: f67fed5f77f868dc2550cc7267fb454cae2108b3
Component: engine
2016-01-05 09:15:21 -08:00
40a92806fd
fix markdown and typos in API docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 72472f5639fc92f3fd554e4eb860b0cb6938f7c2
Component: engine
2016-01-05 16:33:32 +01:00
ba6c4901c7
Merge pull request #19070 from softprops/shiplift_client
...
add shiplift docker client to remote api client list
Upstream-commit: 09ad1bbc5897e34c6e6d5612b0e1ba709ed28a7d
Component: engine
2016-01-05 14:36:30 +01:00
738f0e36b5
add shiplift docker client to remote api client list
...
Signed-off-by: Doug Tangren <d.tangren@gmail.com >
Upstream-commit: 09e0c9fc24db44217885c58fb6023bcfef211ae0
Component: engine
2016-01-05 08:27:26 -05:00
609d075f70
Merge pull request #19075 from HackToday/fixvoldoc
...
Fix the unnecessary parameter
Upstream-commit: 4a4131ac1b5ca28a06802d4e904bc99afa721d1f
Component: engine
2016-01-05 11:51:33 +01:00
d4f5e05d82
Fix the unnecessary parameter
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 52b944dbba74b7d2be5bcabfe6937a5578020101
Component: engine
2016-01-05 10:26:01 +00:00
722bb40262
Fix a typo error
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 289faeac111486f19537a06166f283e73fa44c4b
Component: engine
2016-01-05 17:42:13 +08:00
