f94025a466
sort flags with the same name in a consistent order
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com > (github: jonboulle)
Upstream-commit: d14cfc8d435dbef0d70b6444b275a025e60ac171
Component: engine
2014-06-27 01:46:59 +00:00
0256ecf832
Merge pull request #6657 from unclejack/refactor_truncindex
...
refactor TruncIndex to use a trie & vendor deps
Upstream-commit: cab7894808d5b43590ec230c2391108536c34108
Component: engine
2014-06-26 16:53:49 -07:00
92fe778319
Merge pull request #6625 from vieux/remove_dockerscript
...
remove dockerscript
Upstream-commit: 69ec5824c3aec1dafb95264577807eac5afd9865
Component: engine
2014-06-26 14:56:22 -07: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
2437455209
Merge pull request #6646 from tiborvass/fix-workdir
...
Fix --workdir=/
Upstream-commit: d91b8bcf0b21f7abf23b06872ad960ebd25e733a
Component: engine
2014-06-25 15:19:51 -07:00
9b24606fc1
Merge pull request #6664 from LK4D4/bench_on_truncindex_delete
...
Add benchmarks on TrucnIndex.Delete
Upstream-commit: 17f653548260b7e1892dc5dd2153e508938af63f
Component: engine
2014-06-25 14:30:28 -07:00
8897c337e6
Allow re-mounting an existing mount with "remount"
...
Without this line of code, if a volume is present in /proc/mounts,
it cannot be remounted with new mount options.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
Upstream-commit: f87afda12344b726c1bfb49b2dc8b5995f86f4ab
Component: engine
2014-06-25 22:06:24 +01:00
bc0ef19fac
Combined AddGet benchmark
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 04a9fe1e62345d282985724b9eb0cd7446c08449
Component: engine
2014-06-25 22:49:38 +04:00
2ab25c0f86
add integration test for --workdir=/
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: baacc7006b35badb2e9ba807451ab158936d7832
Component: engine
2014-06-25 11:02:59 -04:00
3325b6e290
fix bug in FollowSymlinkInScope when link == root
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e
Component: engine
2014-06-25 11:02:59 -04:00
e76ace6106
Add benchmarks on TrucnIndex.Delete
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 7c8445826fdce3e46253a6e194a33407ed9bd154
Component: engine
2014-06-25 09:37:39 +04:00
7c1e43e819
Merge pull request #6595 from LK4D4/env_benchmarks
...
Benchmarks for engine/env
Upstream-commit: 1059e166fd4fbe88a05f182139b6fc5fc95ab6b3
Component: engine
2014-06-24 23:35:00 +03:00
a93d5dc92d
Benchmarks for engine/env
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 01b424028ed0ab7d673c7ae2221457ae12304557
Component: engine
2014-06-24 21:48:16 +04:00
c72045b105
Improve truncindex benchmarks
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 7eb425ccd167487b8424ff680e46216d99fa237a
Component: engine
2014-06-24 21:41:51 +04: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
6d58de7959
Merge pull request #4812 from kzys/freebsd-mount
...
FreeBSD support on pkg/mount
Upstream-commit: d7587aa97686b83b5ab30e342f95425a16480fcb
Component: engine
2014-06-23 17:45:25 -07:00
41bf695f2f
remove dockerscript
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 431a6736d27fa6eced36793099f579d940fc1e94
Component: engine
2014-06-23 22:52:03 +00:00
cd49e29a76
Merge pull request #6527 from subhraveti/cap-whitelist
...
Maintain a whitelist of capabilities rather than droplist
Upstream-commit: 7ba8788919bf6ddb5de626f3b1b89c497eed4b86
Component: engine
2014-06-19 14:48:38 -07:00
5d2f394b9a
Merge pull request #6493 from vieux/fix_cp_mac_os
...
allow utimes on mac os, only lutimes isn't supported
Upstream-commit: abda245ddc38200b6ad24f79d194e6f4125a0100
Component: engine
2014-06-19 14:00:59 -07: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
3557a3b077
sqlite-3.6.20-1 unique constraint message
...
https://github.com/dotcloud/docker/issues/6551
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: b4857dffa8ba0a7b2fe779a0b2264ce1b0b2e7ff
Component: engine
2014-06-19 15:24:22 -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
3a22a04875
allow utimes on mac os, only lutimes isn't supported
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 04bfa8e91f5a934079dd449d1a344bf731917a6b
Component: engine
2014-06-17 23:19:42 +00:00
2883b4234a
prevent panic when empty flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 661a1e90263cc348c17620cf0b250bf552dd4056
Component: engine
2014-06-17 20:45:57 +00:00
f812414977
Merge pull request #6417 from mrunalp/dev/system_prctl
...
Add helper function to make prctl system call.
Upstream-commit: 742d8bf922976dbf6371f198e7c6ad3b55286c90
Component: engine
2014-06-16 17:13:06 -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
407e2d7995
Add helper function to make prctl system call.
...
Docker-DCO-1.1-Signed-off-by: Mrunal Patel <mrunalp@gmail.com > (github: mrunalp)
Upstream-commit: 65567e125d9bd4d4ede25dd03bda11ebf1ef7321
Component: engine
2014-06-13 11:49:57 -07:00
99dc4301cc
remove unused beam, will be back later as libchan
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 384b60b940e07d37c1ff544168a2407513114d80
Component: engine
2014-06-11 19:09:55 +00: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
b8d91613b1
Remove and vendor libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8a8b6d79649f666dd00f2efd60f773bb3eed898d
Component: engine
2014-06-10 19:49:57 -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
1bb9f4a354
Merge pull request #6207 from crosbymichael/nsinit-cli
...
Make nsinit nicer to work with libcontainer
Upstream-commit: acb9f156fdf7f992d73a70c2697b62e3eb17bfc9
Component: engine
2014-06-05 16:51:31 -07:00
e7cde49487
Merge pull request #6224 from tiborvass/storage-options
...
Add --storage-opt daemon option and some devicemapper option (with fixes)
Upstream-commit: 9329c0d2e08671e3d152c11595f398ff01e5fa18
Component: engine
2014-06-05 16:00:03 -07:00
124f8c9778
Merge pull request #6145 from shykes/pr_out_pkg_testutils_utility_functions_to_facilitate_writing_go_tests
...
pkg/testutils: utility functions to facilitate writing Go tests
Upstream-commit: 2f72fdf6eac43ebb89028308a6d5a5fac0b93ecc
Component: engine
2014-06-06 01:26:53 +03:00
19c2bab6db
Update for nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f3621531579495e7de911004d47e077d421fcfb8
Component: engine
2014-06-05 14:31:16 -07:00
9760ac9e6f
Update nsinit to be nicer to work with and test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1a3d43c23ec7bbb1aa206581acd0497c47e29a2f
Component: engine
2014-06-05 14:13:02 -07:00
82966c0798
pkg/units: Add FromHumanSize
...
This does the "reverse" of HumanSize, i.e. maps a string to an int64
using SI prefixes for the extension.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 13f07b636f014331a5d5dc0eac40d6ac9e5c9263
Component: engine
2014-06-05 10:02:37 +02:00
f1a3b9e98b
Exclude the user namespace for setns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7eb508633db93213404292bd4fd21b6855f45bea
Component: engine
2014-06-04 18:03:17 -07:00
a3fd3c7cb6
Move env load to nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8497d1274b046804999699ccb66b11a3249906a1
Component: engine
2014-06-04 17:54:00 -07:00
f1f202bb40
Adding initial version of C-based nsenter for allowing execin in
...
libcontainer.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 0a725ea28259f8a0f9a1de5730fd99675b942dde
Component: engine
2014-06-05 00:44:13 +00:00
e9b3abdfc5
Rename nsinit package to namespaces in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8aff01c0b447fa4d68f053c44e8baf7b24247164
Component: engine
2014-06-04 15:47:57 -07:00
fac037791f
Merge pull request #6198 from vishh/stats2
...
Add more stats to libcontainer.
Upstream-commit: fd21da4b0b91becf491d753549e9a5f7158aebbd
Component: engine
2014-06-04 15:28:19 -07:00
d17e332286
Add stats for memory allocation failure count and instantaneous cpu usage in the usermode and kernelmode.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 8d63b610c39eb34b06f275b507c482460015531e
Component: engine
2014-06-04 21:20:21 +00:00
cda4353dab
implement wait on freeze
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: dc21dd2634791d272b8e39493815bb81eaba5605
Component: engine
2014-06-04 02:21:10 +00:00
b048abf5ab
Merge pull request #6183 from crosbymichael/fix-freezer-fs
...
Don't rejoin the freezer cgroup each time
Upstream-commit: 2c27e6e9abb01d5a1c8c5d1c16aef6daf82b6b99
Component: engine
2014-06-03 16:16:58 -07:00
525251ebaa
Merge pull request #6180 from unclejack/apparmor
...
apparmor: write & load the profile on every start
Upstream-commit: 37d69aae5e2aaf914629d9f416fd59c34deb94ab
Component: engine
2014-06-03 15:56:28 -07:00
44f1195c6c
Don't rejoin the cgroup each time
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 534521301c81bcc536446351cf4018f02d477d2a
Component: engine
2014-06-03 15:24:30 -07:00
