Michael Crosby
19debeb255
Merge pull request #18027 from tpounds/fix-err-message-typo
...
Fix error typo when --expose and --net are specified
2015-11-17 11:34:40 -08:00
Alexander Morozov
4dda67b801
Merge pull request #16452 from rhatdan/btrfs-selinux
...
Relabel BTRFS Content on container Creation
2015-11-17 11:03:40 -08:00
Alexander Morozov
f18d5da6a7
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
David Calavera
d507acb175
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
2015-11-17 16:40:06 +01:00
GoBella
c16dd88c5e
"Assert change"
...
Signed-off-by: GoBella <caili_welcome@163.com >
2015-11-17 18:40:18 +08:00
David Calavera
af9757576c
Merge pull request #17556 from donhcd/testForStatsVersioning
...
Test for stats versioning
2015-11-17 11:19:34 +01:00
Trevor Pounds
a25988cf76
Fix typo when --expose and --net are specified.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
2015-11-16 22:01:20 -08:00
Kunal Kushwaha
aa7fd884e6
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
2015-11-16 15:28:09 +09:00
Antonio Murdaca
7929888214
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-15 10:40:01 +01:00
Olle Jonsson
4e8fcd4002
/info: Add keys Architecture, OSType
...
- introduces Swarm-relevant keys, see #13634
- docs updated
Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com >
2015-11-14 22:21:45 +01:00
Vincent Demeester
31a6e01f47
Merge pull request #17009 from azurezk/user-checkers
...
add c.Assert in docker_cli_ps_test.go
2015-11-14 20:22:15 +01:00
Arnaud Porterie
7a6f2cdeeb
Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
...
New version of notary with pkcs11 client integration
2015-11-14 12:03:29 +01:00
Anil Belur
4699ef8f87
Adding test for the fix #17168 .
...
The test case creates a mount point, starts the daemon with the
graph dir pointing to the mount and initates a pull request. We should
be able to check for the error message when the mount point gets filled
during pull.
Signed-off-by: Anil Belur <askb23@gmail.com >
2015-11-14 16:24:45 +05:30
Srini Brahmaroutu
b1cc78b8f5
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-11-14 03:16:45 +00:00
Michael Crosby
28612c5587
Merge pull request #17978 from Microsoft/jjh/removevolumecheck
...
Windows: Remove check for volume support
2015-11-13 15:59:41 -08:00
Alexander Morozov
f5e318a17b
Merge pull request #17090 from duglin/dockerignoreWildcards
...
Support multi-dir wildcards in .dockerignore
2015-11-13 14:29:34 -08:00
Doug Davis
eddb14a44e
Support multi-dir wildcards in .dockerignore
...
Closes #13113
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-11-13 13:44:07 -08:00
David Lawrence
52021ac2a4
fixing tests for updated CLI output
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-11-13 13:20:55 -08:00
John Howard
8209571982
Windows: Remove check for volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-13 13:02:30 -08:00
Alexander Morozov
4302c14a64
Merge pull request #16920 from mountkin/fix-attach-test
...
fix the flaws in the test of the attach API
2015-11-13 12:05:22 -08:00
Alexander Morozov
a4acb1db4a
Merge pull request #17615 from WeiZhang555/17404-net-inspect-name
...
Include container names in `network inspect`
2015-11-13 11:54:59 -08:00
Mike Brown
430d8ff611
modifying docker --since and --until to support nanoseconds and time zones
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
2015-11-13 09:56:15 -06:00
Todd Whiteman
f6a037d474
integration-cli: support remote docker host that uses TLS - fixes #17952
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
2015-11-12 16:16:33 -08:00
Vincent Demeester
812a1c149a
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
Vincent Demeester
ce29a8cc37
Merge pull request #17200 from maaquib/16756-integration-cli-events-test
...
Using checkers assert for integration-cli/docker_cli_events_test.go
2015-11-12 16:43:12 +01:00
David Calavera
fc36475184
Merge pull request #17898 from zelahi/16756-createtest-dockercli
...
changed if else statements to c.Asserts in docker_cli_create_test.go.
2015-11-12 07:37:29 -08:00
Mohammed Aaqib Ansari
2910f1101d
Using checkers assert for integration-cli/docker_cli_events_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
2015-11-11 18:12:30 -05:00
Antonio Murdaca
9d4e2f3992
Merge pull request #17913 from clnperez/oom-test-requires
...
Add the memoryLimitSupport requirement to Events OOM tests
2015-11-11 23:24:10 +01:00
Dan Walsh
1716d497a4
Relabel BTRFS Content on container Creation
...
This change will allow us to run SELinux in a container with
BTRFS back end. We continue to work on fixing the kernel/BTRFS
but this change will allow SELinux Security separation on BTRFS.
It basically relabels the content on container creation.
Just relabling -init directory in BTRFS use case. Everything looks like it
works. I don't believe tar/achive stores the SELinux labels, so we are good
as far as docker commit.
Tested Speed on startup with BTRFS on top of loopback directory. BTRFS
not on loopback should get even better perfomance on startup time. The
more inodes inside of the container image will increase the relabel time.
This patch will give people who care more about security the option of
runnin BTRFS with SELinux. Those who don't want to take the slow down
can disable SELinux either in individual containers or for all containers
by continuing to disable SELinux in the daemon.
Without relabel:
> time docker run --security-opt label:disable fedora echo test
test
real 0m0.918s
user 0m0.009s
sys 0m0.026s
With Relabel
test
real 0m1.942s
user 0m0.007s
sys 0m0.030s
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
2015-11-11 14:49:27 -05:00
David Calavera
0b566566c6
Merge pull request #17858 from sanimej/libn
...
Allow port mapping only for endpoint created on docker run
2015-11-11 11:00:31 -08:00
Tibor Vass
7a985cfafc
Merge pull request #17890 from aboch/b6
...
Restore deterministic IPv6 from MAC behavior on default bridge network
2015-11-11 12:42:08 -05:00
Alessandro Boch
095a8ac545
Restore IPv6 from MAC on default bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-11-11 08:36:04 -08:00
Ma Shimiao
0fbfa1449d
Add support for blkio.weight_device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-11-11 23:06:36 +08:00
Vincent Demeester
d6856db128
Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip
...
Test to ensure that the bridge ip is excluded from the allocator pool
2015-11-11 10:42:13 +01:00
Zuhayr Elahi
91041884f8
changed if else statements to c.Asserts in docker_cli_create_test.go.
...
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com >
2015-11-10 23:15:32 -08:00
Tibor Vass
09980ef7ac
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
Christy Perez
e86b79fccc
Add the memoryLimitSupport requirement to OOM tests
...
The docker run commands in these tests uses the -m flag,
so the tests should require that it's supported to run.
Fixes 17215 (maybe)
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2015-11-10 18:06:13 -06:00
Tonis Tiigi
86faf1e165
Add test for builder cache with root source path
...
Fixes #17827
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-11-10 10:15:09 -08:00
David Calavera
470fc94f38
Merge pull request #17476 from coolljt0725/prevent_connect_to_host
...
Fix connect to host and prevent disconnect from host for host network
2015-11-10 09:48:33 -08:00
David Calavera
014bab03ef
Merge pull request #17789 from duglin/Issue17781
...
Allow for env vars to have spaces in some cases
2015-11-10 08:55:11 -08:00
Alessandro Boch
c7cd659624
Fix fixed-cidr daemon option
...
- Logic is broken when gateway ip falls in ip-range
and ip-range is not the first block in the network
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-11-09 15:51:46 -08:00
Tibor Vass
62b484411e
Merge pull request #17779 from calavera/fix_dns_regression
...
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
2015-11-09 18:07:07 -05:00
David Calavera
58b270c338
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
Doug Davis
6990f8c616
Allow for env vars to have spaces in some cases
...
Closes #17781
This allows for env vars in EXPOSE to be parsed for spaces so that each
"word" is then treated independently instead of as a single word/arg.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-11-09 12:42:56 -08:00
Vincent Demeester
e509fe604c
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
2015-11-09 19:59:18 +01:00
Alexander Morozov
2786af3add
Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix
...
Use checker for docker_cli_run_unix_test.go
2015-11-09 10:44:32 -08:00
Vincent Demeester
8054a30387
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 >
2015-11-09 19:32:46 +01:00
David Calavera
f1a74a89f8
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 >
2015-11-09 12:46:48 -05:00
Lei Jitang
a2d8c93fc6
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 >
2015-11-09 10:19:53 +08:00
Lei Jitang
3c4dab51d3
Remove DOCKER_EXECDRIVER env
...
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.
Signed-off-by: Lei Jitang <leijiang@huawei.com >
2015-11-09 09:17:32 +08:00