fbb5f4e19f
Merge pull request #17393 from tiborvass/carry-17360
...
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00
6c30abdc61
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 >
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00
9cd08e6796
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
2015-10-27 13:39:40 -07:00
95c227e717
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
Upstream-commit: 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862
Component: engine
2015-10-27 13:29:18 -07:00
af90e68a88
Merge pull request #17405 from LK4D4/cont_pointer
...
Return pointer from newBaseContainer
Upstream-commit: 82f70677b99e7d30c63d40658b36b0c5373cadba
Component: engine
2015-10-27 13:27:10 -07:00
c2f87fdd0e
Fix docker inspect container only reports last assigned information
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 1b9a08e719776e53b7aea1a89c2c29fbf27b1ae4
Component: engine
2015-10-27 16:26:06 -04:00
64556fe044
Merge pull request #17406 from LK4D4/ent_and_args_simple
...
Simplify getEntrypointAndArgs
Upstream-commit: 2b1b7823e61d9d14064708d37a56275ee7385bd2
Component: engine
2015-10-27 13:24:59 -07:00
edfe664f0f
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
Upstream-commit: 64854277f87d5f5d1f79db340ecb0b82d82f1865
Component: engine
2015-10-27 13:21:15 -07:00
c7cd2c91a7
Merge pull request #17230 from aboch/ae
...
Do not update etc/hosts file for every container
Upstream-commit: 194b64951a19ef6254422891cc9ff191ed2567cd
Component: engine
2015-10-27 16:14:44 -04:00
4d261096ec
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 >
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
2015-10-27 20:36:07 +01:00
8ad5b6fcfd
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 >
Upstream-commit: 3e7db73b99498d037b43eb59972a6360cfbc971b
Component: engine
2015-10-27 11:03:22 -07:00
33a72eeb51
Simplify getEntrypointAndArgs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5f6d27cebaec3d2e9e72579c91591aea5bcb6966
Component: engine
2015-10-27 09:36:11 -07:00
b9824763f3
Return pointer from newBaseContainer
...
It makes code more consistent.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6d9bb99c97438edc996e51e13a0aca0feabc5d26
Component: engine
2015-10-27 09:05:28 -07:00
2dad2ae0d3
Merge pull request #17389 from tonistiigi/15995-duplicate-names
...
Fix duplicate container names conflict
Upstream-commit: b72a431928d6389727d07235bc4d5a7b22403a53
Component: engine
2015-10-27 02:42:50 -04:00
3ad728d9e8
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 >
Upstream-commit: 4f6f00e1916a8c58e67c8118d015988d86718d19
Component: engine
2015-10-26 20:08:57 -07:00
6085efedb0
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 >
Upstream-commit: aee54863741fc3f012c423d1a445d1a6b687966a
Component: engine
2015-10-26 16:57:50 -07:00
b67a8a66b5
Merge pull request #17285 from Microsoft/10662-exectp4workaround
...
Windows [TP4] Trap Hyper-V exec failure
Upstream-commit: fe1e04a84f51b3abf5fd426a6a4ee0125683aa11
Component: engine
2015-10-26 16:47:51 -07:00
8335ef1684
Merge pull request #17378 from Microsoft/10662-unmountwithsyscall
...
Windows: Volumes PR rename UnmountWithSyscall
Upstream-commit: 4cbe227db868f347a493ec611b1c8131dc5509df
Component: engine
2015-10-26 16:15:00 -07:00
80a2aecaad
Merge pull request #17384 from mavenugo/42def
...
Simple Info log to indicate the chosen IP Address for the default bridge
Upstream-commit: 3f11360a54499ad2d1c873c7e502b414d907528d
Component: engine
2015-10-26 19:11:56 -04:00
0eb23a0f71
Simple log to indicate the chosen IP Address for the default bridge
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 126d1b6ca195ed425a691a5f3faeba254ebff094
Component: engine
2015-10-26 14:46:08 -07:00
ff22689d64
Windows: Refactor resources structure
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b1220a763c5046efe8caa3e245c84633a29c3684
Component: engine
2015-10-26 13:48:16 -07:00
16f288f74f
Windows: Volumes PR fix one of Tibors nits
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 853f2e9952b94c52101d69003161b654a7cd4384
Component: engine
2015-10-26 13:34:49 -07:00
e58c7d88fe
Merge pull request #17180 from rhatdan/destroy
...
Docker is calling cont.Destroy twice on success
Upstream-commit: 5087e8c2e86ba61d7cec9abec00ee6bf64939d0d
Component: engine
2015-10-26 15:48:04 -04:00
213dc33b1a
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: be1c77595eed1d9b22511faf64783e4c65f40c61
Component: engine
2015-10-23 19:46:28 -07:00
f937755755
Merge pull request #16488 from splunk/splunk_log_driver
...
Add Splunk logging driver #16207
Upstream-commit: 8d4888df90c30a189821699e444bd6587c035a20
Component: engine
2015-10-23 18:22:14 -07:00
ba56bd47ca
Add libnetwork call on daemon rename
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 8e0bbb28986c9aca5c51f546ba6fd0f1041ace14
Component: engine
2015-10-23 16:26:24 -07:00
27d55a1112
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
Upstream-commit: e74cf8acad799aff39bf1b8ceffdef471aa0d242
Component: engine
2015-10-23 18:43:07 -04:00
7a1aba432f
Add Splunk logging driver #16207
...
Allow to send Splunk logs using Http Event Collector
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 1f1dbf312ddc299bdad408ce3d6b71f4f5993652
Component: engine
2015-10-23 13:37:53 -07:00
4731b3ece3
Windows [TP4] Trap Exec Hyper-V Cont error
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2e56e78caf4e7cfe026ebb549e4419f1c4434817
Component: engine
2015-10-23 08:42:24 -07:00
95b57bebf2
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
553ed6afa5
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 >
Upstream-commit: 20faaaa872444b6fffbc5a6d30310a782caafe0f
Component: engine
2015-10-22 12:02:02 -07:00
f7f7ce4926
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a7e686a779523100a092acb2683b849126953931
Component: engine
2015-10-22 10:42:53 -07:00
c9ccdaace3
Merge pull request #17220 from calavera/fix_double_removal
...
Do not fail when a container is being removed and we request its delete again.
Upstream-commit: 70af70aa0b448b49940f9971bc87ca9ed7cdd9c4
Component: engine
2015-10-21 13:57:16 -07:00
533bd1241f
Merge pull request #16890 from runcom/perf-boost
...
rmi and build cache miss performance improvements
Upstream-commit: 56ef47e881359776638903ef1636cb7030ca5eec
Component: engine
2015-10-21 16:00:25 -04:00
6f2afc4020
Merge pull request #17245 from dhiltgen/discovery_tls
...
Wire up libnetwork with TLS discovery options
Upstream-commit: 94a16c81f4b6f44c8ffd8974f71c2975d524d32a
Component: engine
2015-10-21 15:20:24 -04:00
64dbd1e1a8
Merge pull request #17213 from calavera/volume_driver_validate_name
...
Validate volume names for the local driver.
Upstream-commit: 8247eff8a807d88bb683251bdbb16de6a52f0402
Component: engine
2015-10-21 11:48:54 -07:00
77ceb17e18
Merge pull request #16992 from burke/fix-mqueue
...
Fix --ipc=host dependency on /dev/mqueue existing
Upstream-commit: 678acbcb3fc370e31f677c71a5f8615f2ad3a353
Component: engine
2015-10-21 11:25:37 -07:00
53531be5ba
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 >
Upstream-commit: 10e7806984947304767690785b6fb329fd93283a
Component: engine
2015-10-21 09:38:58 -07:00
f1b2a78ca3
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 >
Upstream-commit: d6d60287ee3a8a064340582d65c131181ae77127
Component: engine
2015-10-21 12:28:26 -04:00
58dd738ff1
daemon: faster image cache miss detection
...
Lookup the graph parent reference to detect a builder cache miss before
looping the whole graph image index to build a parent-children tree.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f9e81b40f4065e3d0851172759ef58fda6572cce
Component: engine
2015-10-21 17:13:45 +02:00
d7d07ab148
graph: add parent img refcount for faster rmi
...
also fix a typo in pkg/truncindex package comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad
Component: engine
2015-10-21 17:13:45 +02:00
a8c08d4980
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
Upstream-commit: 78e21679761c4aa2ea6b1254bf66525088ff0460
Component: engine
2015-10-20 19:45:08 -04:00
130257f149
Do not fail when a container is being removed and we request its delete again.
...
Abort the process and return a success response, letting the original
request finish its job.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c4e49d10143178c718178ff7ce857f4f8ed46a0b
Component: engine
2015-10-20 18:48:34 -04:00
834dc8ee1e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
988eb3b3bf
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 27f908a051eb835c7cab59e596b8dee7ca92873b
Component: engine
2015-10-20 11:19:37 -07:00
fdccaa20d5
Merge pull request #17176 from rhvgoyal/fix-locking-issue
...
devmapper: Drop devices lock before returning from function
Upstream-commit: 7777c1be9bd5604014a0ac3f16e85960c4c0779a
Component: engine
2015-10-20 13:08:29 -04:00
7cf93e47cd
validate the name of named volume
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn >
Upstream-commit: 609961ddcc835422e51ef4f3fd6088b96180f72f
Component: engine
2015-10-20 12:36:04 -04:00
db6db88cda
Merge pull request #17035 from estesp/fix-build-dir-perms
...
Correct build-time directory creation with user namespaced daemon
Upstream-commit: ad861876e8bb86091527f31fc944205743e5ce85
Component: engine
2015-10-20 08:57:19 -07:00
47faea6d70
Merge pull request #17191 from mrjana/restart
...
Fix docker startup failure due to dangling endpoints
Upstream-commit: 566964bf73475e994ca605bd2106de045509d23f
Component: engine
2015-10-20 10:32:33 -04:00
9aebf5450b
Correct build-time directory creation with user namespaced daemon
...
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.
Add tests for the mkdir variants in pkg/idtools
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: ae8c004dc18c59fec9cd67759a5e0087300e872d
Component: engine
2015-10-20 08:59:48 -04:00
David Calavera
Alexandre Beslic
Lei Jitang
Tibor Vass
Vincent Demeester
Madhu Venugopal
Alexander Morozov
Alessandro Boch
Tonis Tiigi
John Howard
Brian Goff
Sebastiaan van Stijn
Santhosh Manohar
Denis Gladkikh
Jess Frazelle
Phil Estes
Daniel Hiltgen
Antonio Murdaca
xlgao-zju
Alexander Morozov
Phil Estes