Commit Graph

21804 Commits

Author SHA1 Message Date
fdf9a8d629 Remove job from container_inspect
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
2015-04-23 00:58:13 +02:00
519d29da21 Merge pull request #12460 from moxiegirl/fix-carry-12383
Putting into our new format for cloud
Upstream-commit: 20b1aa08f8112cb2176d75e9f6fa27eab0ea5e44
Component: engine
2015-04-23 08:52:56 +10:00
54ac8d85af Merge pull request #12650 from LK4D4/carry_12472
remove execCreate & execStart from job
Upstream-commit: 3c9ae03a868bb86fdb3026a21ef1b9a3f6a75dfb
Component: engine
2015-04-22 15:32:14 -07:00
a57edd59f7 Merge pull request #12657 from dqminh/remove-unused-utils
remove unused utils
Upstream-commit: 7708ab5ce2f08bd9d3b492794d997efaccd253fe
Component: engine
2015-04-22 15:23:57 -07:00
925bb7aac9 remove unused utils
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: 71b5a754cec09b2f1bcef986bdd6fd109451b8f2
Component: engine
2015-04-22 21:53:45 +00:00
bfa8bbb7bb Merge branch 'master' of github.com:docker/docker into journald
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: b88b2fa72ea4ad579478080ce6f027e55cfd5c29
Component: engine
2015-04-22 17:37:26 -04:00
9099ab32e6 add regression test for rmi multiple tags without f
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 28f5541b72a898762575a2ed0995cae7452fa275
Component: engine
2015-04-22 14:23:05 -07:00
f72daf37a9 add integration test for error pull nonexistent
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 7a525c6cb74af854d621f5560868b32694d2553b
Component: engine
2015-04-22 14:11:25 -07:00
cd9ba3cbe6 Correctly format API error on image pull
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: fd4f7c4e5c4460bad7baf0854f1edc1bbf93aeef
Component: engine
2015-04-22 14:11:25 -07:00
3779d0ae84 Merge pull request #12621 from LK4D4/test_push_interrupt_daemon
Run TestPushInterrupt on separate daemon
Upstream-commit: 29265448ecaf7721b24cbc64978bc7e2adbc4c08
Component: engine
2015-04-22 14:05:37 -07:00
f089bf1e0a remove execCreate & execStart from job
Also removed the function ExecConfigFromJob

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
2015-04-22 13:51:57 -07:00
1114daff30 Wait until all pushes are done in TestPushInterrupt
Background pushes affects other tests

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c09765ac431a85f9ad231c52cbe562bb6f0b0b06
Component: engine
2015-04-22 13:36:43 -07:00
58808570b1 update contrib docs for gocheck
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: a09ab40f0d980b2a6d6656db638f1fc5d73f5b8b
Component: engine
2015-04-22 13:19:14 -07:00
8f7ae62228 Merge pull request #12588 from hqhq/hq_fix_cpuquota_warn
remove redundant warning
Upstream-commit: 975e668722810646a0e260bd9fb8527fb4d9266b
Component: engine
2015-04-22 13:07:21 -07:00
e75be891ca Add integration test for history option
Parse the history output to locate the size fields and check
whether they are the correct format or not. Use Column name SIZE
to mark start and end indices of the size fields

Fixes #12578

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 08150150bbc4477cbcf8286bc15a1cf8b4428e35
Component: engine
2015-04-22 12:22:01 -07:00
73573e4387 Merge pull request #12376 from Mic92/refactor-hack
Refactor shellscripts
Upstream-commit: e3e1c2be42d3aa6c4da7fe4286c2937bf55c4c0d
Component: engine
2015-04-22 12:12:44 -07:00
38db3bc7c2 Merge pull request #12647 from duglin/FixTesting
Remove old testing stuff that slipped into master
Upstream-commit: 6f94ca6d8b9e23dc33bdf6da520f0e585b3dedf9
Component: engine
2015-04-22 14:47:37 -04:00
5f7ff29c8f Remove old testing stuff that slipped into master
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b4988d8d75b4ee915ade6013de76bb1336917528
Component: engine
2015-04-22 11:44:54 -07:00
ae1dbb3bcd Merge pull request #12623 from peggyl/api-client-docs
Fix golint errors in docker/api/client
Upstream-commit: 901ae9aaead770fade5b4367d775043cd9336076
Component: engine
2015-04-22 14:09:23 -04:00
f0797cd197 Merge pull request #12637 from sublimino/patch-1
Add kali to install script
Upstream-commit: 5728426f27eac479ffbb58bf886721fd84b9425f
Component: engine
2015-04-22 11:05:13 -07:00
b22067113f Merge pull request #12634 from PeterDaveHello/patch-2
Use svg instead of png to get better image quality
Upstream-commit: fd3b722928613a194508e094535c8b0f3da9967a
Component: engine
2015-04-22 10:53:47 -07:00
e6ff00789e Update with @moxiegirl's patch and add direct config
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9689aab5ec0141a70c2134d18cb581ec5a923c5f
Component: engine
2015-04-22 10:36:38 -07:00
766ebf1059 Fix TestEventsImageImport racy, fixes #12499
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: eeb8ceb9edb61f4b8889360e4c4a2c4250c2d9f6
Component: engine
2015-04-22 17:30:30 +02:00
a1213158fa Add kali to install script
https://www.kali.org/ is a Debian derivative. This script completes
succesfully using the Debian install path

Signed-off-by: Andrew Martin <sublimino@gmail.com>
Upstream-commit: 2dd88af79b0e1af6df0551b993cd9fffbd5881ee
Component: engine
2015-04-22 14:56:00 +01:00
3fb10b1144 Use svg instead of png to get better image quality
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
Upstream-commit: b121d94369164391369cd02a559a7b64b482f59d
Component: engine
2015-04-22 18:45:29 +08:00
ed4e61e70a Fix golint errors in docker/api/client
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
Upstream-commit: 58065d0dd9adec4b2f397a453652cc8cc7237a17
Component: engine
2015-04-22 00:14:23 -07:00
78da009c7c Append icc related iptables rules, not INSERT
Signed-off-by: Gosuke Miyashita <gosukenator@gmail.com>
Upstream-commit: 90a8e45604f42d60d58b4cefa37a5e5d3112b64a
Component: engine
2015-04-22 11:45:46 +09:00
18e1b423ee Fixing a few links in registry
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 54ff1dcb829e67d62dd4686bdc19522d63c3e0d3
Component: engine
2015-04-21 18:36:37 -07:00
6284903b5f Add Configuring Docker article [WIP]
Fixes #12088

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d
Component: engine
2015-04-21 17:49:29 -07:00
3a0cec3089 remove redundant warning
And warning is not supposed to have a prefix WARNING.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f3dc35169780e1555b4116986649b729cb80b5d1
Component: engine
2015-04-22 08:15:00 +08:00
1b7f0b8878 Merge pull request #12611 from LK4D4/remove_eng_chain_pull
Remove chain of engine passing from builder to loadManifest
Upstream-commit: ccbb93e1cd38ad0a38455ad054b170f444aa9da3
Component: engine
2015-04-21 19:19:56 -04:00
be3d252948 Merge pull request #12511 from LK4D4/gocheck_suites
Gocheck suites
Upstream-commit: 61854b171d1e8afbbc30f268e793356996ff4c77
Component: engine
2015-04-21 15:42:33 -07:00
c9ef8ab72d devmapper: Cancel deferred deactivation if device is reactivated
If device is being reactivated before it could go away and deferred 
deactivation is scheduled on it, cancel it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: ddc8acebecfdc7dbc0357f5c009fb3ee0a2ae906
Component: engine
2015-04-21 18:14:59 -04:00
3d40ab6ccb devicemapper: Create a method to get device info with deferred remove field
Deferred reove functionality was added to library later. So in old version
of library it did not report deferred_remove field. 

Create a new function which also gets deferred_remove field and it will be
called only on newer version of library. 

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 4986ce7cfbe74610d4fa2c4e79ceefe49c1aa155
Component: engine
2015-04-21 18:14:59 -04:00
f0bbbffba0 devicemapper: Create helpers to cancel deferred deactivation
If a device has been scheduled for deferred deactivation and container
is started again and we need to activate device again, we need to cancel
the deferred deactivation which is already scheduled on the device.

Create a method for the same.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 20b38f427aa05186bd09c8c4201dcc95ed56aa46
Component: engine
2015-04-21 18:14:59 -04:00
be8151e80b devmapper: Export deferred removal status in status
This will help with debugging as one could just do "docker info" and figure
out of deferred removal is enabled or not.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 66a53819aea2ab1ab0d50be1f8d32fcb2427cd78
Component: engine
2015-04-21 18:14:59 -04:00
807639ca3d devmapper: Use deferred removal
Make use of deferred removal of devices.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: e37c7203bb1d840e9383ac08bf87afda3e722344
Component: engine
2015-04-21 18:14:59 -04:00
de64b1affe devmapper: Provide a new parameter dm.deferred_device_removal
Provide a new command line knob dm.deferred_device_removal which will enable
deferred device deactivation if driver and library support it.

This patch also checks for library support and driver version.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 15c158b20725fd62e2ee0a72ffaf1617852cd0d9
Component: engine
2015-04-21 18:14:59 -04:00
2651813036 devicemapper: Add helper functions to allow deferred device removal
A lot of time device mapper devices leak across mount namespace which docker
does not know about and when docker tries to deactivate/delete device,
operation fails as device is open in some mount namespace.

Create a mechanism where one can defer the device deactivation/deletion
so that docker operation does not fail and device automatically goes
away when last reference to it is dropped.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 6964ab94befd8723585556e560219e0eef48a488
Component: engine
2015-04-21 18:14:59 -04:00
d1b60e7633 make.sh: Define a new build tag libdm_no_deferred_remove
libdm started offering deferred remove functionality from version
1.02.89. As docker still builds against older libdm, define a tag
libdm_no_deferred_remove to determine whether we are compiling
against new libdm or older one and enable/disable deferred remove
functionality accordingly.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: b3e29926cef104c9ef99ff05ed1490cf821bb7b0
Component: engine
2015-04-21 18:14:59 -04:00
43e79cc411 Remove chain of engine passing from builder to loadManifest
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
2015-04-21 14:55:23 -07:00
a499d975cf Putting into our new format for cloud
Adding in Seb's comments
Updating with Fred's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: bc7a43cb44fc0541939f10186e326e3139403605
Component: engine
2015-04-21 14:48:48 -07:00
60a0268238 Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
Remove some unsupported instructions in the docs.
Upstream-commit: 21c8d211e1bd508091c1dfecb29a32988ac2a17a
Component: engine
2015-04-21 14:08:31 -07:00
79e92cb2ff Merge pull request #12567 from brahmaroutu/integration_test6_12255
moving integration tests to graph unit tests
Upstream-commit: 7ba8c3b26ffedc869c2868c3e90ef81315af6b8f
Component: engine
2015-04-21 13:58:02 -07:00
b383a47d39 Merge pull request #12600 from LK4D4/remove_image_set
Remove image_set engine job
Upstream-commit: 725ea8c09ef974d85f562919b6610354069e0cde
Component: engine
2015-04-21 16:51:46 -04:00
b6c443e015 Merge pull request #12564 from LK4D4/remove_jobs_trust
Remove engine from trust
Upstream-commit: b098a42559f8f70a56a587a06608ee00641ebdaf
Component: engine
2015-04-21 16:49:01 -04:00
490d3d47ba Merge pull request #12609 from runcom/remove-not-needed-readHostConfig
Remove not needed call to container.readHostConfig()
Upstream-commit: 783dbcade36fa3816ad4be817b62bd53b74b9080
Component: engine
2015-04-21 13:45:48 -07:00
95350b9286 Remove image_set engine job
It was unused

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 79a7fedcd8f9aaa42ec4e7f0fdd1f915c27e850b
Component: engine
2015-04-21 13:04:28 -07:00
7c675b1db2 Remove not needed call to container.readHostConfig()
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a3c4801c9291c0db78c5cc0748d5d2dd5e44a98f
Component: engine
2015-04-21 22:00:33 +02:00
b0e45c14c4 Add Image Digest doc in userguide/dockerimages
Fixes #12551

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: a4676503d9531b50b26643df5ea3975bdec6b4df
Component: engine
2015-04-21 12:47:09 -07:00