7bef428110
Merge pull request #18306 from runcom/add-test-suffix
...
integration-cli: add _test suffix to test file
2015-11-30 17:02:15 +01:00
a26accfb5d
Merge pull request #18226 from duglin/Issue18170
...
Fix for zero-sized layers
2015-11-30 09:57:37 -06:00
f3ff09f578
Merge pull request #18272 from hqhq/hq_fix_kernel_memory
...
Fix kernel memory limit
2015-11-30 10:01:45 -05:00
1f0f41e8d7
integration-cli: add _test suffix to test file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 11:33:57 +01:00
d3af7f283d
Add OomScoreAdj to configure container oom killer preferences
...
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 11:19:04 +01:00
0a426c47c8
Update cgroup integration tests
...
Cgroup integtaion tests should cover:
- docker can run sucessfully with these options
- these cgroup options are set to HostConfig as expected
- these cgroup options are really set to cgroup files as expected
- other cases (wrong value, combinations etc..)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-11-30 08:40:47 +08:00
dd7b4fd651
Fix kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-11-28 09:47:25 +08:00
4c3c3fedf8
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-27 17:10:09 +01:00
a415b0c220
Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test
...
Checkers on docker_cli_pull_local_test.go
2015-11-27 17:04:28 +01:00
b8c21783f0
Merge pull request #17108 from coolljt0725/fix_remove_image
...
Fix docker rmi trying to remove a being used parent
2015-11-26 12:21:30 -08:00
7bb9fc415a
Fix for zero-sized layers
...
Moved a defer up to a better spot.
Fixed TestUntarPathWithInvalidDest to actually fail for the right reason
Closes #18170
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-25 18:02:03 -08:00
0bbc9f1d2d
Fix docker rmi trying to remove a being used parent
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-26 09:57:20 +08:00
49088b0b89
Merge pull request #18243 from jfrazelle/fix-test
...
fix consistetly failing TestContainerRestartSuccess
2015-11-25 17:07:17 -05:00
f91115e3a2
fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-25 13:04:59 -08:00
1beb450fa6
Merge pull request #18215 from mountkin/test-for-18181
...
add a test to make sure port is allowed in images filter
2015-11-25 10:14:09 -05:00
899caaca9c
Fix spelling of 'existent'
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-25 13:45:37 +00:00
8819b530db
add a test to make sure port is allowed in images filter
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-25 10:46:23 +08:00
bc2682badc
Checkers on docker_cli_pull_local_test.go
...
Applying #16756 to integration-cli/docker_cli_pull_local_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-24 12:53:43 -05:00
4352da7803
Update daemon and docker core to use new content addressable storage
...
Add distribution package for managing pulls and pushes. This is based on
the old code in the graph package, with major changes to work with the
new image/layer model.
Add v1 migration code.
Update registry, api/*, and daemon packages to use the reference
package's types where applicable.
Update daemon package to use image/layer/tag stores instead of the graph
package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-24 09:40:25 -08:00
d53a9bcb13
Checkers on docker_api_inspect_unix_test.go
...
Applying #16756 to integration-cli/docker_api_inspect_unix_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 22:03:14 -05:00
5cfa13ae48
Checkers on integration-cli/docker_api_info_test
...
Applying #16756 to integration-cli/docker_api_info_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 14:28:41 -05:00
463c53c715
Checkers on integration-cli/docker_api_images_test
...
Applying #16756 to integration-cli/docker_api_images_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 10:33:32 -05:00
3243e504d0
Ensure adding a broken tar doesn't silently fail
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-11-23 14:18:58 +00:00
a600bf4eab
Merge pull request #17489 from WeiZhang555/network-rm-multi
...
Enhance `docker network rm` to delete multi net
2015-11-23 08:25:33 +01:00
e7eb6687ef
Enhance `docker network rm` to delete multi net
...
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-22 05:37:00 +08:00
3ff9bb5332
Merge pull request #16613 from WeiZhang555/docker-cp-symlink
...
Add option `-L` to allow `docker cp` follow symbol link
2015-11-21 17:03:24 +01:00
048280ca42
Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm
...
Increase timeouts to fix integration-cli tests on ARM
2015-11-20 15:05:26 -08:00
6653f82796
Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
...
modifying docker --since and --until to support nanoseconds and time …
2015-11-20 23:37:44 +01:00
88c1bc10c4
Increase timeouts to fix test on ARM
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-11-20 23:12:12 +01:00
aef344dcf8
Replace s.d.Start() with s.d.StartWithBusybox()
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-11-20 22:16:19 +01:00
8fa09749fb
Merge pull request #17718 from wenchma/17716_before_filter_doc
...
Re-implement --before and --since as options for --filter
2015-11-20 11:24:19 -08:00
6e49343202
Merge pull request #18067 from cpuguy83/fix_pull_space_test
...
Make TestDaemonNoSpaceleftOnDeviceError linux only
2015-11-20 10:51:21 -08:00
44d3f2f71a
Make TestDaemonNoSpaceleftOnDeviceError linux only
...
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-20 12:44:49 -05:00
92600bdec1
Add '-L' option for `cp`
...
Fixes #16555
Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-21 00:36:56 +08:00
1814a1dac5
Use checker Assert for integration-cli/docker_api_exec_test.go
...
Partially fix issue #16756
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 23:34:52 +08:00
1921c62938
Re-implement --before and --since as options for --filter
...
* This commit will mark --before and --since as deprecated, but leave their behavior
unchanged until they are removed, then re-implement them as options for --filter.
* And update the related docs.
* Update the integration tests.
Fixes issue #17716
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 13:10:13 +08:00
ee03a05595
Merge pull request #17005 from mavenugo/restart
...
Adding a restart test to make sure #16887 doesnt happens again
2015-11-19 17:01:34 -08:00
249b3a9479
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
2015-11-19 15:50:07 -08:00
9c21e852b2
Merge pull request #18082 from MHBauer/gh9406
...
Remove defaults for flags/options that expect no value
2015-11-19 15:06:21 -08:00
8e6e38990c
Merge pull request #18084 from wenchma/18054_exec_start_fix
...
Update docs and test of exec create api return codes
2015-11-19 13:51:46 -08:00
2a07b19fd8
Test that paused containers show up filtering by status.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-19 14:32:25 -05:00
48718a3c77
Remove defaults for flags/options that expect no value
...
- isZeroValue function from upstream go
- covers booleans, strings and numbers
- change integration to reflect new behavior
- resolves #9406
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-19 08:37:51 -08:00
01b86d612c
Update docs and test of exec create api return codes
...
Fixes issue #18054
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-19 22:22:27 +08:00
be9b7a2459
Adding a restart test to make sure #16887 doesnt happens again
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-18 23:29:25 -08:00
7179c89943
Merge pull request #18046 from LK4D4/carry_16822
...
Revert AppArmor skip tests
2015-11-18 10:37:53 +01:00
db08adb5cb
Merge pull request #18004 from Gobella/master
...
update docker_cli_pull_trusted_test.go
2015-11-18 10:32:28 +01:00
c00c64c20e
Merge pull request #18047 from aaronlehmann/push-fix
...
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
2015-11-17 17:03:13 -08:00
e2417e3e92
Merge pull request #17617 from askb/17168_pull_error_fix
...
Fix for #17168 issue
2015-11-17 16:10:44 -08:00
0ab6b1d922
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
...
This fixes an issue where two images with the same filesystem contents
and configuration but different remote IDs could share a v1Compatibility
file, resulting in corrupted manifests.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-17 16:05:09 -08:00
a935359ec7
Merge pull request #17294 from zhangjianfnst/16756-integration-cli-checkers-cp
...
Use checker assert for integration-cli/docker_cli_cp_* four files.
2015-11-17 16:00:00 -08:00
92ea146790
Merge pull request #17452 from aditirajagopal/16756-docker_cli_by_digest_test
...
Checkers on docker_cli_by_digest_test
2015-11-17 15:58:05 -08:00
104dab87ea
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
2015-11-17 15:44:57 -08:00
a9afebae62
Modified cpuset test for unicore test environment
...
Modified TestInspectApiCpusetInConfigPre120 and
TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu
environment.
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2015-11-17 13:28:09 -07:00
70ce2d9b10
Skip apparmor tests on User Namespace
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-17 11:49:31 -08:00
0df0b6b443
Revert "Skip TestAppArmorDeniesChmodProc"
...
This reverts commit 04e1015aa0
2015-11-17 11:46:42 -08:00
1bf5fcd911
Revert "Skip TestRunUnshareProc"
...
This reverts commit 03dce24137
2015-11-17 11:46:42 -08:00
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
4dda67b801
Merge pull request #16452 from rhatdan/btrfs-selinux
...
Relabel BTRFS Content on container Creation
2015-11-17 11:03:40 -08:00
f18d5da6a7
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
d507acb175
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
2015-11-17 16:40:06 +01:00
c16dd88c5e
"Assert change"
...
Signed-off-by: GoBella <caili_welcome@163.com>
2015-11-17 18:40:18 +08:00
af9757576c
Merge pull request #17556 from donhcd/testForStatsVersioning
...
Test for stats versioning
2015-11-17 11:19:34 +01:00
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
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
7929888214
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-15 10:40:01 +01:00
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
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
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
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
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
28612c5587
Merge pull request #17978 from Microsoft/jjh/removevolumecheck
...
Windows: Remove check for volume support
2015-11-13 15:59:41 -08:00
f5e318a17b
Merge pull request #17090 from duglin/dockerignoreWildcards
...
Support multi-dir wildcards in .dockerignore
2015-11-13 14:29:34 -08:00
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
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
8209571982
Windows: Remove check for volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:02:30 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
09980ef7ac
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
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
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
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
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
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
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
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
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
Vincent Batts
Phil Estes
Antonio Murdaca
Antonio Murdaca
Qiang Huang
Antonio Murdaca
Alexander Morozov
Doug Davis
Lei Jitang
Jess Frazelle
Jessica Frazelle
Brian Goff
Bryan Boreham
Shijiang Wei
Aditi Rajagopal
Tonis Tiigi
Aidan Hobson Sayers
Zhang Wei
Michael Crosby
Stefan Scherer
David Calavera
Wen Cheng Ma
Morgan Bauer
Madhu Venugopal
Aaron Lehmann
Daehyeok Mun
Alexander Morozov
Eric Windisch
GoBella
Trevor Pounds
Kunal Kushwaha
Olle Jonsson
Arnaud Porterie
Anil Belur
Srini Brahmaroutu
David Lawrence
John Howard
Mike Brown
Todd Whiteman
Mohammed Aaqib Ansari
Dan Walsh
Tibor Vass
Alessandro Boch
Ma Shimiao
Zuhayr Elahi
Christy Perez