Commit Graph

2189 Commits

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