7af08aef44
Merge pull request #6683 from vieux/add_links_inspect
...
add links to inspect for 'linking' containers
Upstream-commit: e35a9a7def6113ffff2c624142ef194abfa7e916
Component: engine
2014-06-26 17:33:02 -07:00
68391774fe
Update libcontainer Context changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: c9fdb08bdafb90b76cfa804b079d2e446a3503e4
Component: engine
2014-06-26 16:56:39 -07:00
d4f4419563
Change misnamed TarFilter to TarWithOptions
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 111ab125b954c8d28503e1922e742eb271cc5d04
Component: engine
2014-06-26 22:49:08 +00:00
12c0cff814
add links to inspect for 'linking' containers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 55691e5fdc78b5c3015c7a481371e482878c14d2
Component: engine
2014-06-26 20:51:38 +00:00
9c28be7542
devmapper: add thin-pool blocksize to the 'docker info' output
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: a2f3ce2294bbe998df24edd50f2b571d0b21bac8
Component: engine
2014-06-26 12:39:16 -04:00
fbe2366f74
devmapper: document the default DM thin pool blocksize
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 79f217e3501a43326bd532e8eb03182f7488f61c
Component: engine
2014-06-26 12:06:41 -04:00
55be9bc370
refactor TruncIndex to use a trie & vendor deps
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e0dad305791a7406cf819a27fa5a079a46a62acc
Component: engine
2014-06-26 16:57:54 +03:00
9a4ed6541e
Merge pull request #6218 from vieux/update_maintainers
...
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
2014-06-25 17:00:32 -07:00
06a813f16e
Merge pull request #6643 from kzys/freebsd-cp
...
cp's -T and --reflink=auto are only available on GNU coreutils
Upstream-commit: 6d8e95557cd63b6e8302255d6e070f24d7c2e6d5
Component: engine
2014-06-24 14:29:18 -07:00
3d6c57f495
Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor
...
Update libcontainer dep to 5210a236b92a8022a673108f347
Upstream-commit: 408963ed4d4ea5ffca99c08b3e22bf720eb19b88
Component: engine
2014-06-24 13:51:04 -07:00
df9f902ba5
Merge pull request #6648 from LK4D4/truncindex_bench
...
Truncindex benchmarks
Upstream-commit: c4dbd4f7c0ff3f33705db21a709c3475ebe0770b
Component: engine
2014-06-24 22:10:33 +03:00
0daa61f085
Rename libcontainer.Container to libcontainer.Config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 1dc8e2ffab795f4999a122b4a576d54e03c7c61a
Component: engine
2014-06-24 11:31:03 -07:00
d4e9300e80
Update libcontainer references
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: cee6f4506c79c6fc21769d427ac4dd51c28450c3
Component: engine
2014-06-24 11:31:03 -07:00
1ce22444ec
Move truncindex in separate package in pkg/
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ed032ddfd68a8654671a13d676c0f7539e36a10b
Component: engine
2014-06-24 21:19:15 +04:00
bda9d074fe
devmapper: remove extra space in DefaultThinpBlockSize assignment
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: f9c078ef38106d00de7774374f3ac71bb0d562d3
Component: engine
2014-06-24 12:43:45 -04:00
e00d89f257
devmapper: Add option for specifying the thin pool blocksize
...
Add dm.blocksize option that you can use with --storage-opt to set a
specific blocksize for the thin provisioning pool.
Also change the default dm-thin-pool blocksize from 64K to 512K. This
strikes a balance between the desire to have smaller blocksize given
docker's use of snapshots versus the desire to have more performance
that comes with using a larger blocksize. But if very small files will
be used on average the user is encouraged to override this default.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 09ee269d998ad04733ef577739fa051df9d3f12e
Component: engine
2014-06-24 12:10:28 -04:00
d61150b2d4
devmapper: use RAMInBytes() rather than FromHumanSize()
...
Device Mapper needs device sizes in binary (1024) multiples. Otherwise
kernel checks can find that the specified thin-pool device sizes aren't
a multiple of the specified thin-pool blocksize.
The name for "RAMInBytes" is likely too narrow given the new consumers
but... Also add "tebibyte" support to RAMInBytes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 2470a5ed999d9dc8d4b9bd250727ac13964db5b3
Component: engine
2014-06-24 12:10:14 -04:00
157a125d05
devmapper: fix reloadPool() to also specify '1 skip_block_zeroing'
...
createPool() and reloadPool() should be consistent with the thin-pool
table params they use.
Since createPool() specifies '1 skip_block_zeroing' reloadPool() should
too. Otherwise, if the pool is reloaded (as is done when resizing
loopback devices) block zeroing will be enabled after the reload
completes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: d420134fa2ea8ceedf2a9a64263d09b308263c2c
Component: engine
2014-06-24 11:23:13 -04:00
7622154038
cp's -T and --reflink=auto are only available on GNU coreutils
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 733711481ee665564f0f2a77d100353d5f9c82e2
Component: engine
2014-06-24 23:58:17 +09:00
417ba2a8cb
Fix typo in README.md
...
Upstream-commit: 21e258d7328e56fd451e6ed0324cff094ec70798
Component: engine
2014-06-24 11:57:24 +05:30
90c80009e3
Add Sockets (-H) list to docker -D info.
...
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
2014-06-24 12:25:17 +10:00
929a82a086
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
2014-06-20 23:55:10 +03:00
2ad31b8e2f
Add cpuguy83 as volumes maintainer
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: ff1ea0064b49bd1d72cafe5d02be9eab4d54b683
Component: engine
2014-06-20 09:40:29 -04:00
16f6e09488
Update close fd issues for lxc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 707ef9618b3b26a0534a0af732a22f159eccfaa5
Component: engine
2014-06-19 16:02:21 -04:00
1316dc9e2d
Use libcontainer cap drop method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: d31ae5aed80eeb40a461930776ad2b507804bf4e
Component: engine
2014-06-19 16:00:53 -04:00
84bd7e4c9e
Maintain a whitelist of capabilities rather than droplist
...
This fixes 6/18 vulnerability
Docker-DCO-1.1-Signed-off-by: Dinesh Subhraveti <dineshs@altiscale.com > (github: dineshs-altiscale)
Upstream-commit: cf331cdd6ad35c6e0d291df51b49aef5909671f5
Component: engine
2014-06-19 03:34:04 -04:00
20c86625c9
Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path
...
5693 volumes from symlink path
Upstream-commit: 7a0e5991421d423908504531bee7b5dc46443b3f
Component: engine
2014-06-18 16:10:37 -07:00
37854d56d0
Merge pull request #6505 from vdloo/master
...
Fixes typo in loopback device error message
Upstream-commit: f3db32c03515353697644fabf4f73e0dfb1d4fc0
Component: engine
2014-06-18 15:55:51 -07:00
f362aed228
Fixes typo in loopback device error message
...
Docker-DCO-1.1-Signed-off-by: Rick van de Loo <rickvandeloo@gmail.com > (github: vdloo)
Upstream-commit: 98041d26bbe68458ca1c2ac7074ef600e832753e
Component: engine
2014-06-18 22:09:28 +02:00
8a9e50b1f5
fix bug in getRootResourcePath in previous commit
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 48907d57ede696c68e210cb93cb405124a49cbd3
Component: engine
2014-06-18 15:51:28 -04:00
c1fafcf79b
daemon: *: updated getResourcePath and getRootResourcePath signatures
...
This patch updates container.getResourcePath and container.getRootResourcePath
to return the error from symlink.FollowSymlinkInScope (rather than using utils).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Remove Inject to help rebase
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Docker-DCO-1.1-Signed-off-by: cyphar <cyphar@cyphar.com > (github: tiborvass)
Upstream-commit: 5c069940db2042d83bd4ef462a8a50d565aaf874
Component: engine
2014-06-18 15:51:28 -04:00
807354f6af
expose unresolved path for volumes and resolve symlink in container.getResourcePath
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 65d4047cb60ec77a4009d25c91b29f95375c8fe5
Component: engine
2014-06-18 15:51:27 -04:00
172faefd3c
Fix go vet errors
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
2014-06-18 17:39:57 +00:00
7d55b5369e
do not alter json in docker save
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3e4e8636c1b05626cae720b47ef99109077e1d3a
Component: engine
2014-06-17 00:06:21 +00:00
4d16453ae7
Merge pull request #6430 from LK4D4/lock_inspect
...
Do inspect under container lock
Upstream-commit: d671768b52a43f27755d10245917103dea6b7416
Component: engine
2014-06-16 15:31:08 -07:00
86a79a73e0
update MAINTAINERS files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 06248d745a6a69b14595a699e0e5b3e883d8ea3a
Component: engine
2014-06-16 22:20:07 +00:00
76dc816a6e
Guillaume is busy full-time on his new business, and no longer available
...
as a maintainer.
Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 41d437117d13d445192b92a93955dec5c012512c
Component: engine
2014-06-16 06:22:15 -07:00
f5efd485e9
Do inspect under container lock
...
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 947405a90951e4715a8399410b67f4f644415d59
Component: engine
2014-06-14 21:08:23 +04:00
5a4d61b92a
Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
...
Fix some more race conditions
Upstream-commit: 51b188c5102e86ad453c933077bcaf9594070c28
Component: engine
2014-06-12 15:17:10 -07:00
c99ab31438
add hostname generation with --net=host
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f5979b9d0dd993a00e064114218ccdbfdaab9fe0
Component: engine
2014-06-12 19:20:57 +00:00
363db75bc0
Select masquerade by outgoing interface rather than by destination subnet
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: a084f4bc61a81eb9076246d85d6cc5168b32a949
Component: engine
2014-06-11 17:09:19 -07:00
455e8c968c
Merge pull request #6060 from dineshs-altiscale/maintainers
...
Add Dinesh Subhraveti to MAINTAINERS
Upstream-commit: c99ee556d4e9a028fa68b40816b75200be690534
Component: engine
2014-06-11 14:37:01 -07:00
5c1bb534bb
Fix race in get/set HostConfig
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: fa7c8d523e8d899ade547fcaacc34a739ab5044f
Component: engine
2014-06-11 15:23:33 +04:00
ab194686ba
Fix race in contStore.List
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 0b3fe5544266b6f9657ecd87989b85b535cc63e1
Component: engine
2014-06-11 15:23:33 +04:00
52b8a282c3
Update libcontainer imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8194556337b65dda71a3d4d7f6ae9653ad5a19a0
Component: engine
2014-06-10 19:58:15 -07:00
b00f7d0626
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: bae6a5a616cfc382f45a25af13633681875ddff0
Component: engine
2014-06-09 16:01:57 -07:00
3c7670e68c
Move libcontainer deps into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6158ccad97db51e756aafefb096d1163aa4d6439
Component: engine
2014-06-09 15:52:12 -07:00
4f6cc66699
Add CAP_KILL to unprivileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fa72eb3a58ebfec8ef1b27d8e7aa8cbdb41733a2
Component: engine
2014-06-07 15:18:18 -07:00
5bfe5a532a
add wait4 after kill
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 30ba7546cb5a1ff7e4915c5a25dd8d72b3bf735b
Component: engine
2014-06-06 00:32:14 +00:00
1d13810851
start containers after all of them are registered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 34bd2d622910444ae0d30bd0ac32005e224074c1
Component: engine
2014-06-06 00:31:58 +00:00
