Vivek Goyal
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
Vivek Goyal
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
Vivek Goyal
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
Alexander Morozov
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
Mary Anthony
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
Fred Lifton
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
Alexander Morozov
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
Brian Goff
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
Brian Goff
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
Alexander Morozov
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
Alexander Morozov
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
Antonio Murdaca
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
Ankush Agarwal
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
Doug Davis
d704315a4a
Merge pull request #12601 from runcom/remove-job-image-get
...
Remove job image_get
Upstream-commit: b807ac111577142f40f1127b1ab7b1924cca54cd
Component: engine
2015-04-21 15:31:42 -04:00
Antonio Murdaca
c53bd31df2
Remove job image_get
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d07fe1836579b0d55813cae8736be31a2891501a
Component: engine
2015-04-21 21:01:09 +02:00
Brian Goff
2ee6cd28f5
Merge pull request #12604 from runcom/remove-job-image-tarlayer
...
Remove job image_tarlayer
Upstream-commit: 6f82613ded38eb39025aebfbc1d6846c087474e5
Component: engine
2015-04-21 14:53:54 -04:00
Antonio Murdaca
16933141bf
Remove job image_tarlayer
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ba0017595ed9ac30273832b93365b0cb1cf60c05
Component: engine
2015-04-21 19:59:45 +02:00
Alexander Morozov
1884ef3b9b
Use suite for integration-cli
...
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
2015-04-21 10:28:52 -07:00
Alexander Morozov
36fe7b2098
Add gocheck to vendored deps
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6dcdf832a3dddc8de17b7f8b1fb1ddb8b20f9077
Component: engine
2015-04-21 10:28:52 -07:00
Dan Walsh
b04ccc089c
Add journald as a supported logger for containers
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 364287b74118de4f04d049426ef37fa9936d2065
Component: engine
2015-04-21 12:57:54 -04:00
Alexander Morozov
17f801b987
Merge pull request #12598 from runcom/remove-writeJSONEnv
...
Remove writeJSONEnv, fixes #12597
Upstream-commit: 371b39c26f3770af8c63162b927b07207764f4b5
Component: engine
2015-04-21 09:54:55 -07:00
Antonio Murdaca
e46db750a1
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 27811355bd15dd2d0f102dd3b02512c677d5da44
Component: engine
2015-04-21 18:14:39 +02:00
James Turnbull
420c9f4038
Merge pull request #12563 from kentoj/patch-1
...
Clarify data volume init with existing data
Upstream-commit: afd56364618c8c638769a8e9fceeaa5376e46ff5
Component: engine
2015-04-21 08:57:22 -07:00
Jörg Thalheim
f62791a8aa
Dockerfile: download go libraries before copy vendor
...
When ever something vendor/ changes the go dependencies have to downloaded again,
which requires internet access and there for is potential slow. COPY and go install is much faster, while the git urls does not change not this often.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: f731b01483ed7010824c5951cc4a27db907c2d47
Component: engine
2015-04-21 11:41:09 +02:00
Jessie Frazelle
cff18dc122
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
Tianon Gravi
c4f89f8977
Merge pull request #12181 from inatatsu/enable-netgo-with-gccgo
...
Enable "netgo" library when we build with gccgo
Upstream-commit: e562495d56bf0fb329bc1f28445faad6934149e8
Component: engine
2015-04-20 17:31:49 -07:00
Jessie Frazelle
23af23a14a
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
2015-04-20 17:28:24 -07:00
Jessie Frazelle
bf5cc9f8c8
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
Upstream-commit: 82f75df9e9faceabd9a2653ac57ad17aeab5e44b
Component: engine
2015-04-20 17:27:17 -07:00
Jessie Frazelle
40cdee7b30
Merge pull request #12517 from mavenugo/master
...
Enhanced port integration-cli tests
Upstream-commit: 874d64e690338a7aba3e8e4ecff793f1893bdb9d
Component: engine
2015-04-20 17:26:48 -07:00
Jessie Frazelle
27af7aa804
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
Upstream-commit: 4bb8924b52a4d8a25ccfcd39a43e7ba22b393424
Component: engine
2015-04-20 17:26:09 -07:00
Jessica Frazelle
f0d8d3abd1
actually depreciate -rm, -sig-proxy, -name, seriously its been forever
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: f3d4c33213088ce3c381156760064f07da76de30
Component: engine
2015-04-20 17:20:23 -07:00
Jessie Frazelle
a2ec388af9
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
Upstream-commit: 4a25c5d25bad693f9e79a810d87f9103769f918c
Component: engine
2015-04-20 17:02:43 -07:00
Jessie Frazelle
df94aca214
Merge pull request #12566 from fntlnz/remove-go1.3.3-support
...
Removed go1.3.3 support
Upstream-commit: e1fd7e25de4574b78cce41becd8ee50bdff23f0c
Component: engine
2015-04-20 17:01:57 -07:00
Jessie Frazelle
6f3bec0db9
Merge pull request #12471 from coolljt0725/fix_weird_output_format
...
Fix weird terminal output format
Upstream-commit: df217120cdc2336181eb3c97fea5acd18ede4ed0
Component: engine
2015-04-20 17:01:02 -07:00
Jessie Frazelle
5bf4abe6b6
Merge pull request #12568 from duglin/TweakConfigPerms
...
Make .docker dir have 0700 perms not 0600
Upstream-commit: fcacb1793e54fd30055efc940737ee2ba1fb49f1
Component: engine
2015-04-20 16:33:10 -07:00
Jessie Frazelle
5a2fc18d12
Merge pull request #12556 from icecrime/update_release_checklist
...
Update release checklist
Upstream-commit: 23ec4cab60c749bef7222beb131fa54aed1d9ad4
Component: engine
2015-04-20 16:31:40 -07:00
Arnaud Porterie
77ca39f0a0
Early API version bump
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: a8253ec7e7ec13c81d5195ddfe3cf2571ce6afff
Component: engine
2015-04-20 15:52:26 -07:00
Arnaud Porterie
9d30ecdb29
Merge pull request #9381 from lebauce/default-gateway
...
Proposal: Allow specifying a default gateway for bridge networking
Upstream-commit: 9838242db1890ae82dd63a6aae134147c74933ef
Component: engine
2015-04-20 15:50:35 -07:00
Jessie Frazelle
d19796473e
Merge pull request #12416 from ya7ya/patch-1
...
adding elementary OS to install script
Upstream-commit: d5dc565432424eaf301687f9409a984246456e79
Component: engine
2015-04-20 14:50:16 -07:00
Phil Estes
e0b5db7169
Merge pull request #12450 from brahmaroutu/integration_test3_12255
...
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
2015-04-20 17:27:17 -04:00
David Calavera
1edadd0f1c
Add flusher check to utils.WriteFlusher.
...
That way we can know when the stream has been flushed.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b05005a1262e53d042512e88c52a6dae0f2e93d
Component: engine
2015-04-20 14:25:45 -07:00
moxiegirl
d92e1d8ce7
Merge pull request #12559 from moxiegirl/fix-12555-rnotes
...
Adding in 1.60 release notes
Upstream-commit: 27fc39fdc07db415478f4478a3681b8f1fbff27b
Component: engine
2015-04-20 14:18:48 -07:00
Doug Davis
988e520cc7
Make .docker dir have 0700 perms not 0600
...
Thanks to @dmcgowan for noticing.
Added a testcase to make sure Save() can create the dir and then
read from it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bfeb98a23607c835c1d9241e282b84acd8dc3606
Component: engine
2015-04-20 14:16:50 -07:00
Lorenzo Fontana
88e80730cf
Removed go1.3.3 support
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
Upstream-commit: 92849fdcce257dfd61a5c95f57cde085ff22b431
Component: engine
2015-04-20 23:09:08 +02:00
Srini Brahmaroutu
b10206f2eb
moving integration tests to graph unit tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 29c5596176769fc99a22b1d0a78dd5ea279fec69
Component: engine
2015-04-20 21:08:45 +00:00
Vincent Demeester
17684bee7e
Add some stdcopy_test (coverage)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2ed4ed50be3a0379d83b9267f62c4c7f665b849f
Component: engine
2015-04-20 22:58:22 +02:00
David Calavera
16569396d9
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
2015-04-20 13:37:06 -07:00
David Calavera
a618f11507
Remove engine.Job references from builder.CmdBuild
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9a2c00975123c17033ac7b50762af82051ec73db
Component: engine
2015-04-20 13:37:04 -07:00
Mary Anthony
3d767d2ff0
Adding in 1.60 release notes
...
Updating with thaJetzah's comments
Adding in Fred's copy edits
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 1f4ef5192c05723e231acc47813c4c8455a0166b
Component: engine
2015-04-20 13:31:22 -07:00
Kent Johnson
f6f7e91ca2
Clarify data volume init with existing data
...
Though I am not clear on the intent of the sentence if it means that existing data in the base image is copied into the new volume then the additions I propose make that more clear than the present language.
Signed-off-by: Kent Johnson <kentoj@gmail.com >
Upstream-commit: ff9f0134aefbee1d3d757454f42e8dd99afb528e
Component: engine
2015-04-20 14:24:40 -06:00