Commit Graph

2291 Commits

Author SHA1 Message Date
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
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
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
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
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
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