Commit Graph

2341 Commits

Author SHA1 Message Date
Alexander Morozov 7f7950aa18 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
2015-10-29 13:45:19 -07:00
David Calavera cdfd9846f4 Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
Fix rmi -f removing multiple tags
2015-10-29 13:01:06 -07:00
Alessandro Boch e03daebb48 Execute buildPortMapInfo after Endpoint.Join()
- As the retrieved info may not be available at
  Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-29 11:47:30 -07:00
David Calavera 0e1618db19 Merge pull request #17437 from LK4D4/put_error
Do not ignore error from driver.Put
2015-10-28 17:32:03 -07:00
Derek McGowan 48e7f7963e Fix rmi -f removing multiple tags
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-10-28 16:07:02 -07:00
Alexander Morozov 990655448d Remove unnecessary error returns
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 15:15:22 -07:00
David Calavera 54d42f4a10 Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
Fix docker inspect display odd gateway value for none network mode
2015-10-28 13:39:59 -07:00
Alexander Morozov bc09eceaf4 Do not ignore error from driver.Put
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 06:54:09 -07:00
Lei Jitang 7fa601adc7 Fix docker inspect display odd gateway value for none network mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 21:47:12 -04:00
Jess Frazelle b227d19cae Merge pull request #17423 from cpuguy83/so_sensitive
Revert "dockerversion placeholder for library-import"
2015-10-27 18:32:18 -07:00
Brian Goff b78ca243d9 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-27 21:23:53 -04:00
David Calavera 9ab71b68af Merge pull request #17393 from tiborvass/carry-17360
Carry Fix docker inspect container only reports last assigned information
2015-10-27 17:00:41 -07:00
David Calavera 25682577c9 Extract network settings types for inspect.
Keeping backwards compatibility.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-27 19:16:21 -04:00
David Calavera 6276c676a8 Merge pull request #17350 from vdemeester/11699-auto-libraryimport
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
Alexandre Beslic 85ae8b034a Merge pull request #17364 from mavenugo/advertise
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
David Calavera 82f70677b9 Merge pull request #17405 from LK4D4/cont_pointer
Return pointer from newBaseContainer
2015-10-27 13:27:10 -07:00
Lei Jitang 1b9a08e719 Fix docker inspect container only reports last assigned information
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 16:26:06 -04:00
David Calavera 2b1b7823e6 Merge pull request #17406 from LK4D4/ent_and_args_simple
Simplify getEntrypointAndArgs
2015-10-27 13:24:59 -07:00
David Calavera 64854277f8 Merge pull request #17390 from sanimej/libn
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07:00
Tibor Vass 194b64951a Merge pull request #17230 from aboch/ae
Do not update etc/hosts file for every container
2015-10-27 16:14:44 -04:00
Vincent Demeester d5cd032a86 dockerversion placeholder for library-import
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
Madhu Venugopal 3e7db73b99 Enhancing --cluster-advertise to support <interface-name>
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it  automation friendly using
docker-machine.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-27 11:03:22 -07:00
Alexander Morozov 5f6d27ceba Simplify getEntrypointAndArgs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:36:11 -07:00
Alexander Morozov 6d9bb99c97 Return pointer from newBaseContainer
It makes code more consistent.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:05:28 -07:00
Tibor Vass b72a431928 Merge pull request #17389 from tonistiigi/15995-duplicate-names
Fix duplicate container names conflict
2015-10-27 02:42:50 -04:00
Alessandro Boch 4f6f00e191 Do not update etc/hosts for every container
- Only user named containers will be published into
  other containers' etc/hosts file.
- Also block linking to containers which are not
  connected to the default network

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-26 20:08:57 -07:00
Tonis Tiigi aee5486374 Fix duplicate container names conflict
While creating multiple containers the second 
container could remove the first one from graph
and not produce an error.

Fixes #15995

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-26 16:57:50 -07:00
David Calavera fe1e04a84f Merge pull request #17285 from Microsoft/10662-exectp4workaround
Windows [TP4] Trap Hyper-V exec failure
2015-10-26 16:47:51 -07:00
David Calavera 4cbe227db8 Merge pull request #17378 from Microsoft/10662-unmountwithsyscall
Windows: Volumes PR rename UnmountWithSyscall
2015-10-26 16:15:00 -07:00
Tibor Vass 3f11360a54 Merge pull request #17384 from mavenugo/42def
Simple Info log to indicate the chosen IP Address for the default bridge
2015-10-26 19:11:56 -04:00
Madhu Venugopal 126d1b6ca1 Simple log to indicate the chosen IP Address for the default bridge
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-26 14:46:08 -07:00
John Howard b1220a763c Windows: Refactor resources structure
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:48:16 -07:00
John Howard 853f2e9952 Windows: Volumes PR fix one of Tibors nits
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:34:49 -07:00
Brian Goff 5087e8c2e8 Merge pull request #17180 from rhatdan/destroy
Docker is calling cont.Destroy twice on success
2015-10-26 15:48:04 -04:00
Alessandro Boch be1c77595e Disable built-in SD on docker0 network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-23 19:46:28 -07:00
Sebastiaan van Stijn 8d4888df90 Merge pull request #16488 from splunk/splunk_log_driver
Add Splunk logging driver #16207
2015-10-23 18:22:14 -07:00
Santhosh Manohar 8e0bbb2898 Add libnetwork call on daemon rename
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-10-23 16:26:24 -07:00
Tibor Vass e74cf8acad Merge pull request #16433 from Microsoft/10662-volumes5
Windows: [TP4] Add volume support
2015-10-23 18:43:07 -04:00
Denis Gladkikh 1f1dbf312d Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-10-23 13:37:53 -07:00
John Howard 2e56e78caf Windows [TP4] Trap Exec Hyper-V Cont error
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-23 08:42:24 -07:00
David Calavera 2afdc6582b Merge pull request #17274 from aboch/ai
Turn off discovery when icc == false
2015-10-22 13:08:31 -07:00
Alessandro Boch 20faaaa872 Turn off service discovery when icc==false
- Turn off built-in service discovery on docker0 bridge
  when icc is false

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-22 12:02:02 -07:00
John Howard a7e686a779 Windows: Add volume support
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-22 10:42:53 -07:00
Jess Frazelle 70af70aa0b Merge pull request #17220 from calavera/fix_double_removal
Do not fail when a container is being removed and we request its delete again.
2015-10-21 13:57:16 -07:00
Tibor Vass 56ef47e881 Merge pull request #16890 from runcom/perf-boost
rmi and build cache miss performance improvements
2015-10-21 16:00:25 -04:00
Phil Estes 94a16c81f4 Merge pull request #17245 from dhiltgen/discovery_tls
Wire up libnetwork with TLS discovery options
2015-10-21 15:20:24 -04:00
David Calavera 8247eff8a8 Merge pull request #17213 from calavera/volume_driver_validate_name
Validate volume names for the local driver.
2015-10-21 11:48:54 -07:00
David Calavera 678acbcb3f Merge pull request #16992 from burke/fix-mqueue
Fix --ipc=host dependency on /dev/mqueue existing
2015-10-21 11:25:37 -07:00
Daniel Hiltgen 10e7806984 Wire up libnetwork with TLS discovery options
This change exposes the TLS configuration settings to libnetwork so it can
communicate with a key/value store that has been set up with mutual TLS.

TLS options were introduced with https://github.com/docker/docker/pull/16644
Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-21 09:38:58 -07:00
David Calavera d6d60287ee Move volume name validation to the local driver.
Delegate validation tasks to the volume drivers. It's up to them
to decide whether a name is valid or not.
Restrict volume names for the local driver to prevent creating
mount points outside docker's volumes directory.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-21 12:28:26 -04:00