Commit Graph

909 Commits

Author SHA1 Message Date
c154ff2dc2 Merge pull request #10713 from swagiaal/pickup-created-resolvconf
Update resolv.conf in containers on file creation.
Upstream-commit: 2380004d30769e9abc2a975dc9f89d83cc459d5f
Component: engine
2015-03-04 10:21:36 -05:00
3a5f5c3238 Merge pull request #11030 from jfrazelle/skip-lxc-remaining-tests
Last three tests skip on lxc.
Upstream-commit: ffc738225db412987d0230f2a557d6115a1bb45e
Component: engine
2015-03-04 09:51:06 -05:00
55588c146b Last three tests skip on lxc.
Now we can scale lxc tests to all PRs.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 321874f37672b2424a7609caa1aac616b3b23c6a
Component: engine
2015-03-04 06:04:25 -08:00
cd57675c32 Merge pull request #11134 from duglin/CheckMultiLineHelp
Fix 'docker ps --help' so the options don't span more than one line
Upstream-commit: ffc755ac14a49f41d0b27204b0a50034397c946e
Component: engine
2015-03-04 05:53:47 -08:00
36f1975bfd Merge pull request #9437 from cpuguy83/set_rlimits_in_container
Allow setting ulimits for containers
Upstream-commit: df7ba57f5f962b1a2d2e267a89ae465541a92371
Component: engine
2015-03-04 04:00:17 -08:00
2d903c82e5 Merge pull request #10798 from ahmetalpbalkan/win-cli/TestEventsUntag-fix
integration-cli: Remove timeout dependency on TestEventsUntag
Upstream-commit: a8b699f5d9a409702fd85a91f87f05f6bab267ed
Component: engine
2015-03-04 03:54:33 -08:00
6827e12a3d Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
Support dockerfile and Dockerfile
Upstream-commit: beea697be365631ceeb92761e094f1ffe307ca33
Component: engine
2015-03-04 03:52:49 -08:00
bc3e4a6737 Support dockerfile and Dockerfile
Closes #10807

Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 15924f238503ffe44e5fcb99415ff753a36e5971
Component: engine
2015-03-03 18:38:50 -08:00
8c703a14a3 Fix 'docker ps --help' so the options don't span more than one line
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5595da2bde6574fe13785f07c55a155a2e90a7ca
Component: engine
2015-03-03 10:02:23 -08:00
a0531c5103 Merge pull request #11005 from ahmetalpbalkan/win-cli/RegistryV2-skip
integ-cli: skip tests launching registry-v2
Upstream-commit: f92213af882761a739fa0d8408e180e437b1a380
Component: engine
2015-03-02 12:41:21 -08:00
b2afcdf656 Merge pull request #11006 from ahmetalpbalkan/win-cli/TestCommitChange-fix
integ-cli: fix TestCommitChange for pulled busybox
Upstream-commit: bedf3f8f201a06a1d0e9add103da2138a375ae97
Component: engine
2015-03-02 12:39:34 -08:00
c6435e1b51 Merge pull request #10986 from crosbymichael/create-api-type
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
2015-03-02 12:22:02 -08:00
d23101e569 Merge pull request #11055 from MabinGo/checkfileoper2
when the file that was opened has been read into buffer, the file should be closed
Upstream-commit: 1500503b29d97257cf8c1789fc320e2409d9b394
Component: engine
2015-03-02 12:18:14 -08:00
8ccc0c87e2 Merge pull request #11003 from brahmaroutu/rename_10996
Prefix / is ignored when container is renamed
Upstream-commit: 89db94ecf904bf09dbf80ca879a2b759443e2392
Component: engine
2015-03-02 09:48:07 -05:00
15ea5ae8fb fix racy events test
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 202709d178a24bcbfac223f0bcd9c4eda669e928
Component: engine
2015-02-27 14:48:39 -08:00
2b1fd26fbf Prefix / to the container name is ignored when container is renamed
Closes #10996

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b
Component: engine
2015-02-27 22:40:04 +00:00
7595c1bf94 Merge pull request #10998 from jfrazelle/fix-filter-events-test-better
Fix events test so it doesnt need new daemon
Upstream-commit: 2768ce0e4e773d0a0331c6294f31fd9ff9450062
Component: engine
2015-02-27 12:05:48 -08:00
030e1d866f Merge pull request #11037 from coolljt0725/add_parse_mac
Add validate the input mac address on docker run command
Upstream-commit: 314a678da7f948548a7f5aae886b3089ce4a7c9b
Component: engine
2015-02-27 12:03:25 -08:00
80fc2cf3da Merge pull request #11011 from coolljt0725/fix_rmi_conflict
Fix docker remove an image show misleading conflicts
Upstream-commit: 13030add69ca84a853c036ac139f3325afc1b0e0
Component: engine
2015-02-27 12:00:12 -08:00
b540023f69 Add validate the input mac address on docker run command
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2ba0fbb0ae1701b638a4bb956187dd878385dc80
Component: engine
2015-02-27 07:27:12 -08:00
b67ac7ee80 when the file that was opened has been read into buffer, the file should be close.
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: d5ea4bae4a15cc9f3c16c046389737682277ff0f
Component: engine
2015-02-27 19:09:17 +08:00
8ee526a485 integ-cli: fix TestCommitChange for pulled busybox
If the tests are running outside a container (i.e.
executed without `make test`), we are using a `busybox`
pulled from Docker Hub (not jpatezzo's docker-busybox).

That one adds an extra
`PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`
env var all the time and that messes the test `TestCommitChange`.
That's currently breaking the windows CI.

I'm keeping the same PATH here but making it explicit
so that it's always set and we verify what we set. It's actually the same
thing if I set `ENV PATH foo` here but I thought it may lead to some
problems hard to debug in the future.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: c1b7792186c2408817e5027fdc1c2e4fa355dcf4
Component: engine
2015-02-26 20:08:16 -08:00
b74aa8d071 Merge pull request #11029 from brahmaroutu/fixtest_10963
When --net=none enabled, the test uses local filesystem
Upstream-commit: bcbe70588d1ff3ff28d78d56e221ff1efb7bbc47
Component: engine
2015-02-26 17:30:02 -08:00
272eeccbe2 Merge pull request #11007 from ahmetalpbalkan/context-close-cleanup
integ-cli: Add a few missing context cleanups
Upstream-commit: 082b7726e22c4e7e161cb715158675ed24fc3e4c
Component: engine
2015-02-26 11:05:30 -08:00
f720e9d2f5 When --net=none enabled, the test uses local filesystem
Closes #10963
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 17b6583a5a352d5cf6d8ba20b018dc96f231f476
Component: engine
2015-02-26 18:24:34 +00:00
4bec37b70e Fix docker remover an image show misleading conflicts
due to its dependency is tagged to multiple repositories

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d9d9175507f3ac2d43fa27bc5f0710c79cd14cfc
Component: engine
2015-02-26 12:01:35 +08:00
2e0ec2c817 Allow setting ulimits for containers
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3f39050637d454e9ee8075153a917c8bfccb5bae
Component: engine
2015-02-25 19:37:43 -05:00
205614d416 Reinit slice for each dir in search
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8be8e41429a3af59df35a6b0281eefd2bb34e1b5
Component: engine
2015-02-25 15:53:07 -08:00
56a989cee4 Merge pull request #10510 from ashahab-altiscale/9875-lxc-image-layer
Added /dev paths to layer comparison
Upstream-commit: 481e75203d8c5db264a795c35d422d081a2f03b0
Component: engine
2015-02-25 14:52:31 -08:00
47a091cc6c Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
2015-02-25 13:46:18 -08:00
3541951109 Merge pull request #11001 from ahmetalpbalkan/win-cli/TestRunNoDupVolumes-fix
integ-cli: pass unix paths to TestRunNoDupVolumes
Upstream-commit: 21811f07861007da1481c7a1ad100720e09ffa98
Component: engine
2015-02-25 09:47:30 -08:00
ba75e02a5f integ-cli: a few context cleanups
These cleanup calls were forgotten, adding these to
reduce garbage on windows CI machines.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: f6e95ef3a4d379fa2d5bd42bd293d61768d8208b
Component: engine
2015-02-25 01:09:06 -08:00
8c8a1fb3a0 integ-cli: skip tests launching registry-v2
Some pull/push tests are launching `registry-v2`
binary which is compiled and installed if the tests
are running in-container through `make test-integration-cli`.

However, registry is not supported to run on non-linux
platforms and we can't really spin up any registry-v2
containers in the remote DOCKER_TEST_HOST at this point.

Just skipping those with the new TestRequirement called
`RegistryHosting`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e2aa8f0cd984fbb31231240052e5505e1b1e3d2f
Component: engine
2015-02-24 23:19:59 -08:00
8535caec3a integ-cli: skip TestRunBindMounts (same-host daemon requirement)
`TestRunBindMounts` requires daemon to be on the same host.
Running this cli test on Linux is fair enough coverage for
this functionality and we can skip this for platforms where
daemon cannot run side-by-side with the cli for now.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 26444e5e9ad3bc2babd62b76a9a4b46d82414738
Component: engine
2015-02-24 21:04:47 -08:00
53cee48083 integ-cli: pass unix paths to TestRunNoDupVolumes
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: db1f8f7481a825a921295adea36d2e56ee8703ae
Component: engine
2015-02-24 18:50:55 -08:00
72ed1a787d Fix events test so it doesnt need new daemon
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 9aff77156b74cc248542601e146d87011819c10c
Component: engine
2015-02-24 18:28:16 -08:00
f8b58965ad integ-cli: Skip some exec tests requiring same-host daemon
This skips tests:
- `TestRunExecDir`
- `TestRunMutableNetworkFiles`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e6f88f091d59a32f7a1cd9baa18b9d792548f36d
Component: engine
2015-02-24 16:39:42 -08:00
735ebac419 Merge pull request #10995 from ahmetalpbalkan/win-cli/SameHostDaemon-skips-2
integ-cli: Skip new tests requiring same-host daemon
Upstream-commit: 1060a5334efac1b478ed7b61fa0d4fb8dc184ff0
Component: engine
2015-02-24 16:36:11 -08:00
2792d90e6f integ-cli: Skip new tests requiring same-host daemon
This skips tests:
- `TestExecAfterContainerRestart`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cfc8372c0a610ab87fed92f6ba6dd4100fef26d8
Component: engine
2015-02-24 16:30:22 -08:00
b3b00f07f4 integ-cli: remove bash dependency from TestSaveDirectoryPermissions
Use the new `runCommandPipelineWithOutput` helper to
remove bash dependency required for piping in
`TestSaveDirectoryPermissions`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: c3e28351a1547f4999aafb0780e4b1a5d84d78ac
Component: engine
2015-02-24 15:52:06 -08:00
6fdd96a789 Merge pull request #10989 from ahmetalpbalkan/win-cli/TestCliProxyProxyTCPSock-skip
integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
Upstream-commit: 11717741fd31cf9e27a07138dfb998f7aed9da4f
Component: engine
2015-02-24 15:47:46 -08:00
d775414696 Merge pull request #10837 from ahmetalpbalkan/win-cli/readContainerFile-with-exec
integration-cli: readContainerFileWithExec for links tests
Upstream-commit: 435d654b093e8662ab8c9f82fe4321dcad81c289
Component: engine
2015-02-24 15:24:48 -08:00
de2c651b17 Merge pull request #9123 from rhatdan/commit-change
Patch to commit-change patch to add docker import support
Upstream-commit: e7dc7a63423911430512bb5ecf693d58de459b40
Component: engine
2015-02-24 17:09:10 -05:00
c1ee38da67 Merge pull request #10935 from coolljt0725/fix_commit
Fix docker commit make a paused container to unpaused
Upstream-commit: bd95269fb917850fcfe8951135a61eb7398bcc71
Component: engine
2015-02-24 13:28:32 -08:00
31a690e69b integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 6a9edfdc3b8ef4ed6febe8cee13dfd6786541b3b
Component: engine
2015-02-24 12:04:33 -08:00
d5ee9d6913 Remove leftover debugging artifact in test
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e9e993922d3173a292d4caaf35cb913ddc494f0c
Component: engine
2015-02-24 11:44:14 -08:00
aab969a855 Move stats api types into api/types package
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7fed7d7eb4d7766d9342821f2667d160c5f958eb
Component: engine
2015-02-24 10:47:47 -08:00
a3a5e74642 I am only seeing the values I set
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4a9fa9650b154e70d55f750c3674c2d6dd390bef
Component: engine
2015-02-24 13:01:36 -05:00
4e766f5eaa pass --change changes to the import job
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
2015-02-24 13:01:36 -05:00
22d99ec297 support changes in commit job
In addition to config env, `commit` now will also accepts a `changes` env which
is a string contains new-line separated Dockerfile instructions.
`commit` will evaluate `changes` into `runconfig.Config` and merge it with
`config` env, and then finally commit a new image with the changed config

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
Upstream-commit: b30257ccf96f646c6b008312d39544d6700f5cb1
Component: engine
2015-02-24 13:01:35 -05:00