0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21311 commits 14 branches 412 tags 338 MiB
Commit graph

531 commits

Author SHA1 Message Date
Jasmine Hegman
ae5fce9fe0 Correcting overlay -> bridge driver in run.md 
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.

Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
 2016-01-24 01:34:04 -07:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-14 22:33:41 +08:00
Vincent Demeester
851c94db1b Merge pull request #19317 from mavenugo/epforce 
Forced endpoint cleanup
 2016-01-14 14:21:30 +01:00
Vincent Demeester
ec143968de Merge pull request #19286 from aboch/ipdocs 
Add missing documentation for static IP options
 2016-01-14 11:00:09 +01:00
Vincent Demeester
63525a6dc5 Merge pull request #19252 from HackToday/fix-vol-resp-doc 
Update response content for volume mounts
 2016-01-14 09:15:13 +01:00
Madhu Venugopal
b464f1d78c Forced endpoint cleanup 
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-13 21:28:52 -08:00
Alessandro Boch
ee14232647 Add missing documentation for static IP options 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-13 14:53:14 -08:00
Sebastiaan van Stijn
661d75f398 Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable 
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
 2016-01-13 13:22:08 -08:00
Tibor Vass
612cf0f172 Merge pull request #19279 from tiborvass/rename-authz-to-authorization 
Rename authz to authorization for greater clarity
 2016-01-13 14:30:18 -05:00
Tibor Vass
5c630ea7c3 Rename authz to authorization for greater clarity 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-13 14:15:37 -05:00
Shishir Mahajan
e47112d3e8 daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-01-13 13:57:31 -05:00
Chun Chen
b70954e60a Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-13 11:30:36 -05:00
Antonio Murdaca
a79f96828f Merge pull request #19249 from calavera/carry_17414 
[Carry 17414] Added additional container information to "docker info".
 2016-01-13 10:42:22 +01:00
Kai Qiang Wu(Kennan)
6a04ecf813 Update response content for volume mounts 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-13 03:48:14 +00:00
Sebastiaan van Stijn
47d87d3b92 Merge pull request #19229 from mavenugo/udlinks 
Local alias support
 2016-01-12 16:47:32 -08:00
David Calavera
e5edc168a6 Complete documentation about extra container information. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-12 18:16:58 -05:00
David Calavera
c0c66c57b2 Merge pull request #19170 from aaronlehmann/delete-prune-digests 
Prune digest references when deleting by tag
 2016-01-12 15:15:36 -08:00
Madhu Venugopal
2aa5f33b20 Docs update for link functionality in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 13:38:48 -08:00
Aaron Lehmann
2f048f73e1 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>
 2016-01-12 12:11:43 -08:00
Sebastiaan van Stijn
1393c450cd Merge pull request #19104 from vdemeester/18957-update-config 
Add a specific config struct for the update command (#18957)
 2016-01-12 09:46:19 -08:00
Sebastiaan van Stijn
c72be040bb Merge pull request #19187 from estesp/lets-do-this 
User namespaces: graduate from experimental
 2016-01-12 09:34:19 -08:00
Sebastiaan van Stijn
301627c677 Merge pull request #18906 from coolljt0725/connect_to_created 
Support network connect/disconnect to stopped container
 2016-01-12 07:06:31 -08:00
Vincent Demeester
a4f6920731 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>
 2016-01-12 08:33:41 +01:00
Phil Estes
cc63db4fd1 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)
 2016-01-11 20:54:57 -05:00
Sebastiaan van Stijn
3f1b16e236 Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port 
Fix ambassador script
 2016-01-11 17:41:53 -08:00
Sebastiaan van Stijn
656979670c Merge pull request #18998 from calavera/syslog_tls 
Allow syslog over TCP+TLS.
 2016-01-11 17:21:38 -08:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-11 20:13:39 -05:00
David Calavera
bce01398dd List engine-api in the client libraries reference. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-11 19:17:13 -05:00
Kim Eik
e732f4e649 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 a9804ab1cb)
 2016-01-11 19:14:44 -05:00
David Calavera
4b98193bea Add support for syslog over TLS. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-11 12:25:34 -05:00
Tõnis Tiigi
c49ccd3192 Merge pull request #19167 from vieux/bring_discovery_on_par 
Bring discovery on par with the one in docker/swarm
 2016-01-08 22:54:01 -08:00
Aidan Hobson Sayers
cc44ea21e4 Fix ambassador script based on SvenDowideit/dockerfiles#37 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-01-08 20:55:22 +00:00
Alessandro Boch
2bb3fc1bc5 Allow user to choose the IP address for the container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-08 10:09:16 -08:00
Shishir Mahajan
50305d66f5 man page fix: remove -e/--exec-drive=native related description 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-01-07 14:21:01 -05:00
Jess Frazelle
938d28e772 Merge pull request #19144 from LK4D4/fix_parent_systemd 
Choose default-cgroup parent by cgroup driver
 2016-01-07 10:24:51 -08:00
Alexander Morozov
c1cd45d547 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>
 2016-01-07 08:56:26 -08:00
Oliver Neal
ade71ace7d 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>
 2016-01-07 12:30:27 +01:00
Sebastiaan van Stijn
3442339b98 Merge pull request #19090 from thaJeztah/fix-api-markdown 
fix markdown and typos in API docs
 2016-01-07 08:32:01 +01:00
Victor Vieux
a931c78540 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>
 2016-01-06 05:18:52 -08:00
moxiegirl
180ff8d501 Merge pull request #19045 from wenchma/network_api_update 
Update docker network api doc
 2016-01-05 10:55:56 -08:00
Sebastiaan van Stijn
72472f5639 fix markdown and typos in API docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-05 16:33:32 +01:00
Vincent Demeester
09ad1bbc58 Merge pull request #19070 from softprops/shiplift_client 
add shiplift docker client to remote api client list
 2016-01-05 14:36:30 +01:00
softprops
09e0c9fc24 add shiplift docker client to remote api client list 
Signed-off-by: Doug Tangren <d.tangren@gmail.com>
 2016-01-05 08:27:26 -05:00
Kai Qiang Wu(Kennan)
52b944dbba Fix the unnecessary parameter 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-05 10:26:01 +00:00
Alexander Morozov
2e3186ab06 Add ability to set cgroup parent for all containers 
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-04 15:16:25 -08:00
David Calavera
723be0a332 Merge pull request #18888 from calavera/event_types 
Event all the things!
 2016-01-04 13:07:33 -08:00
David Calavera
851fe00c64 Add filter by event type and documentation. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-04 14:58:04 -05:00
Sebastiaan van Stijn
9b6592ca85 Fix pid=host example in documentation 
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.

This updates the example to use htop (strace is
not working without disabling apparmor for the container)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-04 16:25:54 +01:00