Wen Cheng Ma
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
Madhu Venugopal
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
David Calavera
7179c89943
Merge pull request #18046 from LK4D4/carry_16822
...
Revert AppArmor skip tests
2015-11-18 10:37:53 +01:00
David Calavera
db08adb5cb
Merge pull request #18004 from Gobella/master
...
update docker_cli_pull_trusted_test.go
2015-11-18 10:32:28 +01:00
Alexander Morozov
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
Alexander Morozov
e2417e3e92
Merge pull request #17617 from askb/17168_pull_error_fix
...
Fix for #17168 issue
2015-11-17 16:10:44 -08:00
Aaron Lehmann
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
Alexander Morozov
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
Alexander Morozov
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
Michael Crosby
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
Daehyeok Mun
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
Alexander Morozov
70ce2d9b10
Skip apparmor tests on User Namespace
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-17 11:49:31 -08:00
Eric Windisch
0df0b6b443
Revert "Skip TestAppArmorDeniesChmodProc"
...
This reverts commit 04e1015aa0
.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-11-17 11:46:42 -08:00
Eric Windisch
1bf5fcd911
Revert "Skip TestRunUnshareProc"
...
This reverts commit 03dce24137
.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-11-17 11:46:42 -08:00
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
Brian Goff
bf5a6d2a83
Merge pull request #17710 from tonistiigi/fix-builder-symlinks
...
Fix symlink handling in builder ADD/COPY commands
2015-11-07 16:32:07 -05:00
Sebastiaan van Stijn
fdc8cce070
Merge pull request #16742 from runcom/10772-docker-stats-all
...
Allow docker stats without arguments
2015-11-07 19:41:03 +00:00
Antonio Murdaca
ae818a820f
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>
2015-11-07 17:03:33 +01:00
David Calavera
1228103563
Merge pull request #17511 from Microsoft/jjh/fix-test-paths
...
Fix test file paths
2015-11-06 15:09:03 -08:00
Lei Jitang
451b79d691
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>
2015-11-06 14:52:35 -08:00
Aditi Rajagopal
1c9a5d7be7
Checkers on docker_cli_by_digest_test
...
Applying #16756 to integration-cli/docker_cli_by_digest_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-06 16:15:35 -06:00
Santhosh Manohar
dedcf6a6ff
Allow port mapping only for endpoint created on docker run
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-11-06 13:54:17 -08:00
Vincent Demeester
7a82429b3d
Use checker for docker_cli_run_unix_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-06 22:49:16 +01:00
Alexander Morozov
e37e329074
Return nice client-side message for docker logs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-06 11:40:48 -08:00
Tonis Tiigi
47da59f7ec
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>
2015-11-06 10:58:12 -08:00
Antonio Murdaca
313b85fa47
integration-cli: requirements: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-06 12:15:42 +01:00
Brian Goff
f1834153de
Merge pull request #17383 from Microsoft/10662-volumeerrors
...
Fix volume error messages
2015-11-05 21:58:03 -05:00
Solomon Hykes
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
David Calavera
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d
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>
2015-11-05 17:09:57 -05:00
Antonio Murdaca
22ef779db9
Merge pull request #17207 from azurezk/assert_docker_cli_help_test
...
update docker_cli_help_test.go
2015-11-05 15:15:52 +01:00
Zhang Wei
fbed26297d
Include container names in `network inspect`
...
This commit makes `docker network inspect` print container names as
service discovery is based on container name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-05 19:16:13 +08:00
Sebastiaan van Stijn
236913f4e8
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
2015-11-05 00:50:08 +01:00
Jess Frazelle
9c1006c8bf
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
2015-11-04 15:39:19 -08:00
Sally O'Malley
41de7a18d8
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-04 15:18:50 -05:00
David Calavera
37849ce1fb
Merge pull request #17184 from cpuguy83/fix_external_volume_tests
...
Fix bug in volume driver test implementation
2015-11-04 12:08:11 -08:00
Alexander Morozov
d4a8d09d1a
Do not rely on string comparison in truncindex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-04 11:34:05 -08:00
Zhang Kun
83b03b0057
add c.Assert in docker_cli_ps_test.go
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-11-04 17:29:25 +08:00
Brian Goff
3564895e84
Fix network settings inspect tests
...
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-03 12:12:19 -05:00
Kun Zhang
8845259f49
update docker_cli_help_test.go
...
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-11-03 18:24:47 +08:00
Doug Davis
c90125dc8a
Merge pull request #17637 from aaronlehmann/network-test-name-typo
...
Fix typo in name of integration test TestInspectApiMultipeNetworks
2015-11-02 20:42:36 -05:00
Aaron Lehmann
701e5dfe8a
Fix typo in name of integration test TestInspectApiMultipeNetworks
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 17:30:16 -08:00
David Calavera
65cbf37bf7
Merge pull request #17626 from mavenugo/ith
...
IT for ungraceful daemon restart with multiple host-mode containers
2015-11-02 15:38:14 -08:00
Derek McGowan
6964f42350
Merge pull request #17557 from aaronlehmann/update-distribution
...
Vendor updated version of docker/distribution
2015-11-02 14:37:04 -08:00
Madhu Venugopal
b323e3df8b
IT for ungraceful daemon restart with multiple host-mode containers
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-02 14:00:11 -08:00
Aaron Lehmann
257c59251b
Vendor updated version of docker/distribution
...
This updates the vendored docker/distribution to the current master
branch.
Note the following changes:
- The manifest package was split into manifest/schema1. Most references
to the manifest package in the engine needed to be updated to use
schema1 instead.
- Validation functions in api/v2 were replaced by the
distribution/reference package. The engine code has been updated to
use the reference package for validation where necessary. A future PR
will change the engine to use the types defined in
distribution/reference more comprehensively.
- The reference package explicitly allows double _ characters in
repository names. registry_test.go was updated for this.
- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
that the schema1 package unmarshals the correct payload. The test is
being changed to modify the JSON without affecting its length, which
allows the pull to succeed to the point where digest validation
happens.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 12:40:18 -08:00
David Calavera
beeec6d103
Merge pull request #17558 from aboch/nw
...
Fix bug in initializeNetwork()
2015-11-02 12:15:41 -08:00
David Calavera
920ab75bd5
Merge pull request #17598 from zelahi/16756-dockercli-createtest
...
Added c.Assert statements to docker_api_create_test.go
2015-11-02 11:43:20 -08:00
Alessandro Boch
45e71a7984
Fix bug in initializeNetwork()
...
- On `docker run --net <network id> ...`
the bug would cause the container to attempt
to connect to the network two times
- Also made sure endpoint creation rollback will
be executed on failures in `func (container *Container) connectToNetwork()`
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-02 11:20:15 -08:00
Alexander Morozov
6563b7d2e8
Merge pull request #17542 from estesp/restart-root-dir-cleanup
...
Fix integration-cli daemon restart with user namespaces enabled
2015-11-02 09:50:12 -08:00
Zuhayr Elahi
6694326d5d
Added c.Assert statements to docker_api_create_test.go
...
removed the if/else statements and added c.Assert statements for docker_api_create_test.go.
Removed check.commentf in c.Assert statements
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-11-01 19:54:19 -08:00
Antonio Murdaca
29c9717cac
Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test
...
refactor docker_cli_netmode_test .go with Assert statement
2015-11-01 11:07:54 +01:00
Phil Estes
0c57b9f5b3
Fix integration-cli daemon restart with user namespaces enabled
...
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-31 14:39:33 -04:00
Arnaud Porterie
5719d01066
Merge pull request #16579 from coolljt0725/fix_attach_paused_container
...
Add show error when attach to a paused container
2015-10-31 07:43:22 -07:00
Brian Goff
cccb6bce7d
Merge pull request #17524 from mountkin/fix-teardown
...
dont try to remove builtin networks in teardown
2015-10-30 20:59:57 -04:00
Donald Huang
8ceded6d03
add tests for docker stats versioning
...
testing for #17549
Signed-off-by: Donald Huang <don.hcd@gmail.com>
2015-10-31 00:23:08 +00:00
Alessandro Boch
e16e794805
IT for daemon restarts when container connected to multiple networks
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-30 16:25:25 -07:00
David Calavera
f301c5765a
Fix network inspect for default networks.
...
- Keep old fields in NetworkSetting to respect the deprecation policy.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-30 16:55:21 -04:00
Vincent Demeester
05534b6f80
Merge pull request #17518 from WeiZhang555/integration-test-bug
...
bug fix for test cases
2015-10-30 16:56:35 +01:00
Shijiang Wei
5970e94072
dont try to remove builtin networks in teardown
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-30 23:05:33 +08:00
Brian Goff
2c6351a4a5
Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test
...
Checkers on integration-cli/docker_cli_commit_test
2015-10-30 10:36:41 -04:00
Vincent Demeester
0598ff46ac
Merge pull request #17427 from zelahi/16756-dockercli-killtest
...
modified docker_cli_kill_test.go to use c.Asserts
2015-10-30 12:56:52 +01:00
Antonio Murdaca
77488b90c5
Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test
...
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
2015-10-30 12:41:14 +01:00
Zhang Wei
8f53edae3b
bug fix for test cases
...
Fix bug that `isNwPresent` can't distinguish network names with same
prefix.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-30 15:13:35 +08:00
Aditi Rajagopal
483abbb313
Checkers on integration-cli/docker_cli_commit_test
...
Applying #16756 to integration-cli/docker_cli_commit_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-10-29 21:47:54 -05:00
John Howard
1847641b7b
Fix test file paths
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-29 15:51:04 -07:00
David Calavera
2eaa25d355
Merge pull request #17499 from jfrazelle/fix-lxc-tests
...
lxc does not support exec
2015-10-29 15:08:13 -07:00
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
Jessica Frazelle
aaa134ea0e
lxc does not support exec
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 11:51:59 -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
Brian Goff
8d62f243c7
Merge pull request #17488 from jfrazelle/skip-windows-test
...
cant run volume on windows w remote daemon host
2015-10-29 13:37:39 -04:00
Jessica Frazelle
1a6a860c14
cant run volume on windows
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 08:55:48 -07:00
Wen Cheng Ma
f4abc6406e
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
...
Fixes part of #16756
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-10-29 21:38:00 +08:00
Jessica Frazelle
44da86172a
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-28 21:14:45 -07:00
Lei Jitang
de1d611990
Add show error when attach to a paused container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-28 21:00:09 -04: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
John Howard
5f4cb33a51
Fix volume error messages
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-28 09:23:43 -07:00
Zuhayr Elahi
d0762a60e0
modified docker_cli_kill_test.go to use c.Asserts
...
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-10-27 21:18:26 -07: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
Brian Goff
2266462f72
Merge pull request #17373 from Microsoft/10662-volumetests
...
Windows: Volume integration tests
2015-10-27 19:52:11 -04: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
Brian Goff
1c8ee617d1
Merge pull request #17382 from jecarey/16765-docker_cli_images_test
...
Use of checkers on docker_cli_images_test.go
2015-10-27 17:25:45 -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
James Carey
5814d67f98
Use of checkers on docker_cli_images_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-27 15:26:38 -05: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
64854277f8
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07: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
Shijiang Wei
4f6f46a11d
refacter attach API tests to use checkers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-27 16:20:06 +08: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
Vincent Demeester
f3f63c6044
Merge pull request #17257 from echo33/docker_cli_exec_test
...
use of checkers on docker_cli_exec_test.go
2015-10-26 23:14:38 +01:00
Vincent Demeester
962243e387
Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test
...
Use of checkers on docker_cli_config_test.go
2015-10-26 23:00:04 +01:00
John Howard
2af5034ce8
Windows: Volume integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 14:33:28 -07:00
David Calavera
2dd822f322
Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test
...
Use of checkers on docker_cli_import_test.go
2015-10-26 13:42:02 -07:00
Michael Crosby
8173acca95
Merge pull request #17374 from brahmaroutu/fix_gccgo_ci
...
GCCGO requires more memory and time to start containers, fixing GCCGO…
2015-10-26 13:33:59 -07:00
Michael Crosby
5cf028d3dd
Merge pull request #17313 from calavera/version_exec_json_check
...
Version exec json check.
2015-10-26 13:32:32 -07:00
Michael Crosby
74a881c9e4
Merge pull request #17368 from HuKeping/update-test
...
Update docker_cli_build_unix_test
2015-10-26 13:21:31 -07:00
Brian Goff
b21f95c612
Merge pull request #17343 from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker
...
Use checker assert for docker_cli_external_graphdriver_unix_test.go
2015-10-26 15:39:08 -04:00
David Calavera
0b5e628e14
Version exec json check.
...
Keep backwards compatibility with old versions of the api.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-26 15:12:06 -04:00
Srini Brahmaroutu
2046ba3e3c
GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-26 19:09:00 +00:00
Alexander Morozov
34439f3ecb
Merge pull request #17351 from mavenugo/predefined
...
Prevent user from deleting pre-defined networks
2015-10-26 10:06:45 -07:00
Hu Keping
f410d7e70f
Update docker_cli_build_unix_test
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-26 21:06:11 +08:00
Antonio Murdaca
9328fc7e62
Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
...
Using checkers assert for integration-cli/docker_cli_export_import_test.go
2015-10-26 13:58:21 +01:00
Federico Gimenez
7058ec278d
Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-26 09:09:38 +01:00
liaoqingwei
d1ed5f62ad
Use of checkers on docker_cli_config_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-26 10:51:12 +08:00
Jian Zhang
f26a31e80c
Use checker assert for integration-cli/docker_cli_cp_* four files.
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2015-10-26 10:22:28 +08:00
weiyan
9120a1fc3e
use of checkers on docker_cli_exec_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-26 10:01:48 +08:00
Brian Goff
75128c46c7
Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
...
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
2015-10-25 20:39:32 -04:00
Madhu Venugopal
ead62b5952
Prevent user from deleting pre-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-25 17:17:29 -07:00
Vincent Demeester
c71e97fc12
Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
...
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
2015-10-25 21:17:50 +01:00
Anil Belur
2a5f04dcc9
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
...
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.
Signed-off-by: Anil Belur <askb23@gmail.com>
2015-10-25 21:43:31 +05:30
Tibor Vass
271f85afac
Merge pull request #17325 from aboch/d0
...
Disable built-in SD on default bridge network
2015-10-25 11:04:27 -04:00
Federico Gimenez
e8da75d4a1
Integration test: bridge ip is excluded from the allocator pool
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-25 09:36:38 +01:00
Anil Belur
6d974ec19d
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
...
This is done by calling waitRun() followed by the docker run, which ensures the container is loaded
before calling docker exec to obtain the env variable set previously.
Incorporated the change as suggeted by duglin.
Signed-off-by: Anil Belur <askb23@gmail.com>
2015-10-24 22:54:24 +05:30
James Carey
04b6b0b47f
Use of checkers on docker_cli_history_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-23 22:32:56 -05: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
Madhu Venugopal
3b16a8c91c
integration-cli test for active container rename and reuse
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
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
Sebastiaan van Stijn
448398c2a8
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
2015-10-23 13:50:35 -07:00
Shijiang Wei
c2eb37f9ae
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-24 00:59:56 +08:00
Brian Goff
b972a6e3f8
Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test
...
Using checkers assert for integration-cli/docker_cli_experimental_test.go
2015-10-23 09:44:32 -04:00
Mohammed Aaqib Ansari
ff91c8ac1a
Using checkers assert for integration-cli/docker_cli_experimental_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-22 20:29:18 -04:00
Michael Crosby
21aecf62a0
Merge pull request #17284 from calavera/buffer_inspect_template
...
Fail when there is an error executing an inspect template.
2015-10-22 17:06:16 -07:00
David Calavera
3b9c13873a
Fail when there is an error executing an inspect template.
...
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-22 19:24:50 -04:00
Tibor Vass
37da495d4c
Merge pull request #17278 from mavenugo/etchosts
...
Vendoring libnetwork & libkv with fixes
2015-10-22 19:02:02 -04:00
Tibor Vass
4c253ddf20
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
2015-10-22 17:14:49 -04:00
Alessandro Boch
5b53839326
Add integ-test for fixed--cidr == bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-22 14:12:46 -07:00
Vincent Demeester
f664f6e4b1
Use RepoTags & RepoDigest in inspect
...
To be coherent with /images/json (images command)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-22 23:00:59 +02: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
Vincent Demeester
48fe12af0c
Merge pull request #16784 from MHBauer/test-refactor
...
use gocheck asserts instead of fatal
2015-10-22 08:34:50 +02:00
Hu Keping
710817a71b
Use checker on integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-22 15:53:17 +08:00
Jess Frazelle
bf8ba3d0c9
Merge pull request #16908 from brahmaroutu/skip_oom_gccgo
...
Skipping two tests when running with GCCGO (CI)
2015-10-21 14:01:59 -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
Sebastiaan van Stijn
9f031f70ce
Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
...
Add support for multiple network in inspect
2015-10-21 11:09:02 -07:00
Tibor Vass
6a7c38a57d
Merge pull request #16940 from coolljt0725/default_tls_host
...
Make default tls host work
2015-10-21 14:02:22 -04:00
Srini Brahmaroutu
dc813c7d13
Skipping two tests when running with GCCGO (CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-21 17:53:59 +00:00
Sebastiaan van Stijn
492945235b
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
2015-10-21 10:21:27 -07:00
Tibor Vass
bb5551746b
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
2015-10-21 12:00:07 -04:00
Antonio Murdaca
f6577be1c9
graph: ensure _tmp dir is always removed
...
Also remove unused func `newTempFile` and prevent a possible deadlock
between pull_v2 `attemptIDReuse` and graph `register`
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-21 17:13:45 +02:00
Antonio Murdaca
56f5e3459f
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>
2015-10-21 17:13:45 +02:00
Antonio Murdaca
04ef69a1e9
integration-cli: docker_cli_build_test: check error before defer
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-21 17:13:45 +02:00
Mohammed Aaqib Ansari
e72f92cb99
Using checkers assert for integration-cli/docker_cli_export_import_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-21 08:57:20 -04:00
Vincent Demeester
7af9f988ac
Add support for multiple network in inspect
...
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.
`docker network inspect host bridge none` is possible now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-21 08:57:29 +02:00
Madhu Venugopal
37627427a2
Integration test for default bridge init with invalid cluster config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-20 19:56:59 -07:00
Brian Goff
78e2167976
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
2015-10-20 19:45:08 -04:00
Brian Goff
c516aa645e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
2015-10-20 16:39:53 -04:00
Alessandro Boch
27f908a051
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-20 11:19:37 -07:00
Vincent Demeester
b7fcc71a3c
Merge pull request #16917 from WeiZhang555/start-inte
...
use of checkers on `integration-cli/docker_cli_start_test.go`
2015-10-20 19:51:15 +02:00
Phil Estes
414cfe9467
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-20 12:03:11 -04:00
Zhang Wei
08944cdef7
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-20 23:07:33 +08:00
Brian Goff
aa8abf637a
Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
...
Use of checkers on docker_cli_info_test.go
2015-10-20 10:48:20 -04:00
Brian Goff
9f19cbc2c4
Fix bug in volume driver test implementation
...
Also cleans up some of the driver handlers and converts this to use
checkers everywhere.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-20 09:17:49 -04:00
liaoqingwei
288214e5ae
Use of checkers on docker_cli_import_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-20 19:58:16 +08:00
Brian Goff
89bfbb1516
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
2015-10-20 07:21:28 -04:00
Mohammed Aaqib Ansari
bc478b453f
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-20 07:04:55 -04:00
liaoqingwei
37b3cd421f
Use of checkers on docker_cli_info_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-20 13:38:55 +08:00
Morgan Bauer
eedeeaf49c
use gocheck asserts instead of fatal
...
- for #16756
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-19 12:30:22 -07:00
Antonio Murdaca
850bc0838a
Return empty Config fields, now omitempty, for API < 1.21
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-19 19:09:36 +02:00
Doug Davis
e62fd33d96
Merge pull request #17115 from mountkin/tag-on-build
...
Proposal: emit a "tag" event when building image with "-t" parameter
2015-10-19 12:35:58 -04:00
Brian Goff
df15523745
Merge pull request #16854 from WeiZhang555/inte-test
...
use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go`
2015-10-19 12:10:31 -04:00
Christy Perez
ae29bd435b
Fix TestInspectInt64 for run scenarios that return warnings
...
Instead of returning only the container ID, starting a container may
also return a warning:
"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"
The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-10-19 08:56:32 -05:00
Lei Jitang
fbb01b8162
Make default tls host work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-19 21:17:37 +08:00
Phil Estes
1f9557ac66
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
2015-10-19 08:25:32 -04:00
Phil Estes
1c783567c0
Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
...
Use of checkers on docker_cli_inspect_experimental_test.go
2015-10-19 08:21:17 -04:00
Shijiang Wei
2968fa44eb
emit a "tag" event when building image with "-t" parameter
...
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-19 20:09:14 +08:00
liaoqingwei
f3b2b8700f
Use of checkers on docker_cli_inspect_experimental_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-19 19:44:04 +08:00
weiyan
a91a874f73
use of checkers on docker_cli_start_volume_driver_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 19:19:57 +08:00
weiyan
7be79767c1
use of checkers on docker_cli_diff_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 19:07:59 +08:00
Antonio Murdaca
eaa1fc41c6
Merge pull request #16897 from sunyuan3/docker_cli_rm_test
...
use of checkers on docker_cli_rm_test.go
2015-10-19 09:14:23 +02:00
Vincent Demeester
cfdb954303
Merge pull request #17162 from echo33/docker_cli_exec_unix_test
...
use of checkers on docker_cli_exec_unix_test.go
2015-10-19 08:54:42 +02:00
weiyan
d65ac42ca8
use of checkers on docker_cli_exec_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 15:14:59 +08:00
Yuan Sun
0780ddc498
use of checkers on docker_cli_rm_test.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-19 10:42:56 +08:00
Vincent Demeester
bece5b82a8
Merge pull request #17008 from liaoqingwei/dev1
...
Update testcases: use of checkers on docker_cli_nat_test.go
2015-10-18 18:11:02 +02:00
liaoqingwei
26ae6d6b36
Use of checkers on docker_cli_nat_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-18 20:02:55 +08:00
Zhang Wei
97b9223a1f
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-18 09:00:08 +08:00
Sebastiaan van Stijn
cffd50752c
Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
...
Vendoring new go-check checkers and use checker for docker_api_build_test.go
2015-10-17 08:50:51 -07:00
Vincent Demeester
253f975fdb
Use checker assert for docker_api_build_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 14:28:13 +02:00
Tobias Gesellchen
0c95eeb584
rename `POST /volumes` to `POST /volumes/create` to be consistent with the other `POST /.../create` endpoints
...
see #17132
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-10-17 14:13:40 +02:00
Brian Goff
9b1fb0d45b
Merge pull request #16871 from ZJU-SEL/fix_version_test
...
update docker_cli_version_test.go
2015-10-17 08:02:18 -04:00
David Calavera
c3f42b29a8
Merge pull request #17113 from mountkin/validate-filter
...
make sure the value of the dangling filter is correct
2015-10-16 16:32:11 -07:00
Tibor Vass
365a0db0f0
Merge pull request #17046 from mavenugo/dopts
...
driver-opts for network create
2015-10-16 15:23:59 -07:00
David Calavera
ec7c368ff0
Merge pull request #16901 from WeiZhang555/rmi-inte
...
Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert
2015-10-16 15:23:00 -07:00
Vincent Demeester
d8b4471a59
Merge pull request #16977 from mountkin/refactor-test
...
refactor integration test to use checkers
2015-10-17 00:22:03 +02:00
David Calavera
258357857b
Merge pull request #17065 from ZJaffee/api-exec-resize-test
...
cleaned up integration-cli/docker_api_exec_resize_test.go
2015-10-16 14:59:06 -07:00
Madhu Venugopal
6f3eb994b5
Pass network driver option in docker network command
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-16 14:33:54 -07:00
Vincent Demeester
c56b02b284
Merge pull request #17081 from ZJaffee/api_network_test
...
Cleaned up integration-cli/docker_api_network_test.go
2015-10-16 23:14:17 +02:00
Brian Goff
84be89a273
Merge pull request #16969 from zhangjianfnst/16756-improve-integration-cli
...
Use c.Assert in integration-cli/docker_cli_logs_test.go
2015-10-16 16:55:44 -04:00
Zachary Jaffee
7b6bca5af1
cleaned up integration-cli/docker_api_exec_resize_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu>
2015-10-16 13:22:40 -04:00
Vincent Demeester
2afdab4454
Merge pull request #17100 from WeiZhang555/port-inte
...
update docker_cli_port_test.go with Assert
2015-10-16 19:06:14 +02:00
Vincent Demeester
71982d8e57
Merge pull request #17105 from liaoqingwei/dev3
...
Use of checkers on docker_cli_pause_test.go.
2015-10-16 17:36:56 +02:00
David Calavera
f9026e2b7b
Merge pull request #17078 from kevinkucharczyk/api_version_test
...
Clean up integration-cli/docker_api_version_test.go
2015-10-16 08:26:53 -07:00
Zhang Wei
1ae4eeb813
update docker_cli_port_test.go with Assert
...
Part of #16756
Use c.Assert instead of condition judgement
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-16 22:58:51 +08:00
Shijiang Wei
98c1a412b4
make sure the value of the dangling filter is correct
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-16 22:09:32 +08:00
Brian Goff
835fbee9a2
Merge pull request #17053 from liaoqingwei/dev2
...
use of checkers on docker_cli_network_unix_test.go
2015-10-16 09:36:59 -04:00
liaoqingwei
851a533a82
Use of checkers on docker_cli_pause_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-16 21:07:02 +08:00