Commit Graph

2494 Commits

Author SHA1 Message Date
940947b2d3 Merge pull request #17909 from LK4D4/info_simple
daemon/info.go: assign proxy fields directly
Upstream-commit: 37dfae3cde79966734c72a57ed2b2d4c653d61b6
Component: engine
2015-11-11 21:15:13 +01:00
724166c497 daemon/info.go: assign proxy fields directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1df0bb5a1309af0402d83061d4404afe7396e657
Component: engine
2015-11-11 11:03:53 -08:00
202ace0de5 Merge pull request #17858 from sanimej/libn
Allow port mapping only for endpoint created on docker run
Upstream-commit: 0b566566c66832ea7d78b6468fb960dd2d4975f9
Component: engine
2015-11-11 11:00:31 -08:00
82cddf7c00 Merge pull request #17193 from cpuguy83/refactor_store_errors
Refactor volume store's error usage
Upstream-commit: 2bb1c530d7e0f20b5822cbff7656c4e0a7cd4930
Component: engine
2015-11-11 10:25:00 -08:00
4fe87618a6 Merge pull request #17890 from aboch/b6
Restore deterministic IPv6 from MAC behavior on default bridge network
Upstream-commit: 7a985cfafc211c8cc302e4c1e14059fc513663ba
Component: engine
2015-11-11 12:42:08 -05:00
621ef05af0 Restore IPv6 from MAC on default bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 095a8ac5451de25a91fc569a6633fdd8d4cabb3f
Component: engine
2015-11-11 08:36:04 -08:00
199c5fdeef Merge pull request #16774 from tonistiigi/15643-aufs-plnk
Copy aufs hardlinks to top layer
Upstream-commit: 10667253951a783785d3236192428a5decca3fef
Component: engine
2015-11-11 07:59:41 +01:00
cb403bcf07 Refactor volume store's error usage
Uses an errors API similar the `net` package.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 43012fe8425650930a21703d9468ab0e777e053a
Component: engine
2015-11-10 20:33:29 -05:00
2d895b215b Merge pull request #17874 from LK4D4/nocheck_nil_map
daemon/info.go: remove check for map nilness
Upstream-commit: 5b718bdee288134e9a0cfc12d0ed655a3858747f
Component: engine
2015-11-10 12:52:52 -08:00
37b87b6310 Merge pull request #17613 from Microsoft/10662-isolationexecopt
Windows: Add default isolation exec driver option
Upstream-commit: d4c4557b1af794c4d7e4a9833b20119c0a4c091c
Component: engine
2015-11-10 19:55:46 +00:00
328de5870b Windows: Add default isolation exec driver option
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a429ad1e35691fb01f3f80461964030d2197a0eb
Component: engine
2015-11-10 11:39:05 -08:00
eed9f30045 Merge pull request #17476 from coolljt0725/prevent_connect_to_host
Fix connect to host and prevent disconnect from host for host network
Upstream-commit: 470fc94f3856640d1c85c90c62a78396a4d55d66
Component: engine
2015-11-10 09:48:33 -08:00
015026bb0d daemon/info.go: remove check for map nilness
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8f311f4d8c80fc33613a0f4ddf723ef1e11b1b17
Component: engine
2015-11-10 09:20:59 -08:00
b05f4e5488 Merge pull request #17843 from LK4D4/discovery_refactor
Refactoring in daemon/discovery.go
Upstream-commit: 6f2c6111d42f823142fc26bc519417b82ffed56b
Component: engine
2015-11-10 07:34:11 +01:00
9a5f43818f Merge pull request #17847 from LK4D4/exec_unnec_var
Remove unnecessary var block in monitorExec
Upstream-commit: 70579bd558e08fc88c06d8925e0be288692d1eac
Component: engine
2015-11-09 23:32:38 -06:00
df0ccc7d18 Refactoring in daemon/discovery.go
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d83b5dc1773a1e4e5f35cebf1625435a3f1a1c60
Component: engine
2015-11-09 15:21:27 -08:00
3ba5945bba Remove unnecessary var block in monitorExec
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 445675e8081ae1e911db2ebd57efd51329574cdf
Component: engine
2015-11-09 15:14:20 -08:00
c53c22b70c Merge pull request #17779 from calavera/fix_dns_regression
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
Upstream-commit: 62b484411e851542cdc05ef36fb287c2245ec70c
Component: engine
2015-11-09 18:07:07 -05:00
7523555ae3 Merge pull request #17450 from rhatdan/selinux
Fix relabel for SELinux
Upstream-commit: 143f3579b0553b50b03438aef76d908a5d327863
Component: engine
2015-11-09 13:19:28 -08:00
2f262fa249 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
2015-11-09 13:15:50 -08:00
21f4b9fc72 Fix relabel for SELinux
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.

If the user does not specify Z or z on the volume mount we should
not attempt a relabel.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: d9011b36176d6245bdc25401633c213d73e14ea0
Component: engine
2015-11-09 14:04:57 -05:00
48001c30bb dockerversion placeholder for library import
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
2015-11-09 19:32:46 +01:00
0345dce058 Use an empty slice as default value for DNS, DNSSearch and DNSOptions
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.

Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1a74a89f89affcfbe311e89aa752b3d551e0340
Component: engine
2015-11-09 12:46:48 -05:00
626bc69479 Refactor exitStatus structure
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 77af7d1067b83cf683745e3f15ce19425beb34e0
Component: engine
2015-11-09 08:26:35 -08:00
4364a664e5 Merge pull request #17089 from Microsoft/10662-ansi
Windows: Native ANSI console support
Upstream-commit: 28588efb47bc22c409f14ea4a534a01c53c6e1bd
Component: engine
2015-11-09 08:05:08 -08:00
0876b5f9e5 Merge pull request #17808 from bboreham/ipc-errormsg
Fix typo in container-start error message
Upstream-commit: 944dc7fa8f2a91fef664e858d53d6bb7d3796266
Component: engine
2015-11-09 07:58:03 +01:00
56752590f4 Typo s/contained/container
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2ff68910e2ac3e16d47de2b95a412e07586a7c60
Component: engine
2015-11-08 18:29:34 -08:00
c27bddf6a0 Prevent connecting to host and prevent disconnecting from host
Container has private network namespace can not to connect to host
and container with host network can not be disconnected from host.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a2d8c93fc690c2244a3bed32a2bbeb8dae449f90
Component: engine
2015-11-09 10:19:53 +08:00
3fb74544b6 Fix typo in error message
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 93405dd037ffb54e7e72d9d36be4a16d1d76fa50
Component: engine
2015-11-08 18:05:34 +00:00
62005e81e4 Merge pull request #17762 from LK4D4/builder_commit
Use name instead of container in Commit
Upstream-commit: 343c8547df8154a0e6772fb3acc881e03dc86452
Component: engine
2015-11-08 15:57:13 +01:00
355f3d0514 Merge pull request #17581 from Microsoft/10662-factoroutexecuser
Windows: Factor out user in execdriver\driver
Upstream-commit: 342e6bb99fd965dad51a79de3886e89f4ca336e4
Component: engine
2015-11-07 22:11:26 -05:00
0d89f7eef8 Merge pull request #17710 from tonistiigi/fix-builder-symlinks
Fix symlink handling in builder ADD/COPY commands
Upstream-commit: bf5a6d2a83cafd6f56224cdabd8692890472950a
Component: engine
2015-11-07 16:32:07 -05:00
a386c27379 Merge pull request #17787 from Microsoft/jjh/execdriverutils
Don't build utils on Windows
Upstream-commit: 98054a8b5cdad069d3b029d6b92788485766a6bd
Component: engine
2015-11-07 21:27:32 +01:00
2709e5fddb Merge pull request #16742 from runcom/10772-docker-stats-all
Allow docker stats without arguments
Upstream-commit: fdc8cce0704c72dc54f95504fe371f5621d89af7
Component: engine
2015-11-07 19:41:03 +00:00
75f7989a9c Don't build utils on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b10dd17e066614dce1bcaafebf6e902ce9ea169d
Component: engine
2015-11-07 08:46:36 -08:00
0bfa6e0ce6 Allow docker stats without arguments
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: ae818a820f49a9bd7ea8b753f124747fc548e501
Component: engine
2015-11-07 17:03:33 +01:00
8fd542a1df Merge pull request #17757 from rhvgoyal/log-blkid-failure
devmapper: Provide more error information if blkid fails
Upstream-commit: 10df5647bd5c9e5946412bd58fefb5323f67bc49
Component: engine
2015-11-07 09:16:14 -05:00
7822116dd5 Merge pull request #17575 from Microsoft/10662-nativetemplate
Windows: Fix native exec template
Upstream-commit: ad55d29c91fc9ce4851cb0d8456bd5517a5eb0cd
Component: engine
2015-11-06 16:14:44 -08:00
a401f0d13c Merge pull request #17576 from Microsoft/10662-graphtest
Windows: Fix daemon\graphdriver\graphtest
Upstream-commit: 1ba280a8db8456649b661e292d687f1be7ed3468
Component: engine
2015-11-06 15:13:31 -08:00
24f23c55ef Test to verify --mac-address doesn't get applied to new endpoint
created on network connect.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 451b79d69102ad95f1b91a52bb4b17c240f41e56
Component: engine
2015-11-06 14:52:35 -08:00
4955633439 Allow port mapping only for endpoint created on docker run
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: dedcf6a6ff6d3aa75efaeb31c197b1c3a19305be
Component: engine
2015-11-06 13:54:17 -08:00
8bd20475ee Fix symlink handling in builder ADD/COPY commands
Fixes #17290

Fixes following issues:

- Cache checksums turning off while walking a broken symlink.

- Cache checksums were taken from symlinks while targets were actually copied.

- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 47da59f7ec4ee0f49d47a9b32abb137bb30b2c48
Component: engine
2015-11-06 10:58:12 -08:00
cd606dc8e8 Use name instead of container in Commit
It will make daemon interface separation easier later.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 38e34cf6da505ad38f0c4cc2b830becdcf67c58a
Component: engine
2015-11-06 10:22:00 -08:00
eaec8fb727 devmapper: Provide more error information if blkid fails
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 2c8b7c597ae43e28887a52a9fcb12273fe7d8797
Component: engine
2015-11-06 08:21:20 -05:00
e11568b0ea Remove LxcConf in daemon_test.go and fix a typo
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 00d00b429ff6f5cecf6789d6b6773b8e979ad0ae
Component: engine
2015-11-06 09:58:06 +08:00
13125ff6b4 Merge pull request #17700 from calavera/remove_lxc
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
90a6db029c Merge pull request #17735 from LK4D4/errcode_resize
Move errcode handling for resize upper
Upstream-commit: b232362310c24a74c01741bb43ec3052ffe49f83
Component: engine
2015-11-05 15:00:48 -08:00
f427a47755 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
b37ddbaf2b Move errcode handling for resize upper
It'll allow to separate daemon layer more cleanly later.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bb0e7eb196c65972ea66154461b7e654d776f92a
Component: engine
2015-11-05 13:42:33 -08:00