Tibor Vass
67f6b0fd43
Merge pull request #6703 from crosbymichael/update-libcontainer-dep
...
Update libcontainer to 53cfe0a1eba9145bf5329abb
2014-06-26 21:20:59 -04:00
Tibor Vass
6e3fe93148
Merge pull request #6579 from vieux/dockerignore
...
Rebased Dockerignore
2014-06-26 21:00:43 -04:00
Michael Crosby
e35a9a7def
Merge pull request #6683 from vieux/add_links_inspect
...
add links to inspect for 'linking' containers
2014-06-26 17:33:02 -07:00
Michael Crosby
c9fdb08bda
Update libcontainer Context changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-26 16:56:39 -07:00
Travis Cline
111ab125b9
Change misnamed TarFilter to TarWithOptions
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
2014-06-26 22:49:08 +00:00
Victor Vieux
55691e5fdc
add links to inspect for 'linking' containers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-26 20:51:38 +00:00
unclejack
e0dad30579
refactor TruncIndex to use a trie & vendor deps
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-26 16:57:54 +03:00
Solomon Hykes
c9e647e42f
Merge pull request #6218 from vieux/update_maintainers
2014-06-25 17:00:32 -07:00
Victor Vieux
6d8e95557c
Merge pull request #6643 from kzys/freebsd-cp
...
cp's -T and --reflink=auto are only available on GNU coreutils
2014-06-24 14:29:18 -07:00
Michael Crosby
408963ed4d
Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor
...
Update libcontainer dep to 5210a236b92a8022a673108f347
2014-06-24 13:51:04 -07:00
unclejack
c4dbd4f7c0
Merge pull request #6648 from LK4D4/truncindex_bench
...
Truncindex benchmarks
2014-06-24 22:10:33 +03:00
Michael Crosby
1dc8e2ffab
Rename libcontainer.Container to libcontainer.Config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:31:03 -07:00
Michael Crosby
cee6f4506c
Update libcontainer references
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:31:03 -07:00
LK4D4
ed032ddfd6
Move truncindex in separate package in pkg/
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:19:15 +04:00
Kato Kazuyoshi
733711481e
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)
2014-06-24 23:58:17 +09:00
Sven Dowideit
f54823bf05
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)
2014-06-24 12:25:17 +10:00
unclejack
a5f5d5e8d7
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
2014-06-20 23:55:10 +03:00
Michael Crosby
707ef9618b
Update close fd issues for lxc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-19 16:02:21 -04:00
Michael Crosby
d31ae5aed8
Use libcontainer cap drop method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-19 16:00:53 -04:00
Dinesh Subhraveti
cf331cdd6a
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)
2014-06-19 03:34:04 -04:00
Victor Vieux
7a0e599142
Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path
...
5693 volumes from symlink path
2014-06-18 16:10:37 -07:00
Victor Vieux
f3db32c035
Merge pull request #6505 from vdloo/master
...
Fixes typo in loopback device error message
2014-06-18 15:55:51 -07:00
Rick van de Loo
98041d26bb
Fixes typo in loopback device error message
...
Docker-DCO-1.1-Signed-off-by: Rick van de Loo <rickvandeloo@gmail.com > (github: vdloo)
2014-06-18 22:09:28 +02:00
Tibor Vass
48907d57ed
fix bug in getRootResourcePath in previous commit
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-18 15:51:28 -04:00
cyphar
5c069940db
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)
2014-06-18 15:51:28 -04:00
Tibor Vass
65d4047cb6
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)
2014-06-18 15:51:27 -04:00
LK4D4
f08cd445b0
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)
2014-06-18 17:39:57 +00:00
Victor Vieux
3e4e8636c1
do not alter json in docker save
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-17 00:06:21 +00:00
Victor Vieux
d671768b52
Merge pull request #6430 from LK4D4/lock_inspect
...
Do inspect under container lock
2014-06-16 15:31:08 -07:00
Victor Vieux
06248d745a
update MAINTAINERS files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-16 22:20:07 +00:00
Solomon Hykes
41d437117d
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)
2014-06-16 06:22:15 -07:00
LK4D4
947405a909
Do inspect under container lock
...
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-14 21:08:23 +04:00
Michael Crosby
51b188c510
Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
...
Fix some more race conditions
2014-06-12 15:17:10 -07:00
Victor Vieux
f5979b9d0d
add hostname generation with --net=host
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-12 19:20:57 +00:00
Michael Crosby
c99ee556d4
Merge pull request #6060 from dineshs-altiscale/maintainers
...
Add Dinesh Subhraveti to MAINTAINERS
2014-06-11 14:37:01 -07:00
Alexandr Morozov
fa7c8d523e
Fix race in get/set HostConfig
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
0b3fe55442
Fix race in contStore.List
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-11 15:23:33 +04:00
Michael Crosby
8194556337
Update libcontainer imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-10 19:58:15 -07:00
Michael Crosby
bae6a5a616
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 16:01:57 -07:00
Michael Crosby
6158ccad97
Move libcontainer deps into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 15:52:12 -07:00
Michael Crosby
fa72eb3a58
Add CAP_KILL to unprivileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-07 15:18:18 -07:00
Victor Vieux
30ba7546cb
add wait4 after kill
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-06 00:32:14 +00:00
Victor Vieux
34bd2d6229
start containers after all of them are registered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-06 00:31:58 +00:00
Michael Crosby
3609b051b8
Move remount as private to the graph drivers
...
If this is at the root directory for the daemon you could unmount
somones filesystem when you stop docker and this is actually only needed
for the palces that the graph drivers mount the container's root
filesystems.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-05 16:02:25 -07:00
Tibor Vass
b1ac791d84
Ensures files get closed properly. Closes #6213
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-06-05 15:13:43 -07:00
Alexander Larsson
0434a2ce64
devmapper: Add blkdiscard option and disable it on raw devices
...
The blkdiscard hack we do on container/image delete is pretty slow, but
required to restore space to the "host" root filesystem. However, it
is pretty useless on raw devices, and you may not need it in development
either.
In a simple test of the devicemapper backend on loopback the time to
delete 20 container went from 11 seconds to 0.4 seconds with
--storage-opt blkdiscard=false.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:45:59 +02:00
Alexander Larsson
a226168a8b
devmapper: Add options for specifying block devices
...
This adds dm.datadev and dm.metadatadev options that you can use with
--storage-opt to set to specific devices to use for the thin
provisioning pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:45:55 +02:00
Alexander Larsson
807bc2cd04
devmapper: Allow specifying filesystem for thin devices
...
This adds the following --storage-opts for the daemon:
dm.fs: The filesystem to use for the base image
dm.mkfsarg: Add an argument to the mkfs command for the base image
dm.mountopt: Add a mount option for devicemapper mount
Currently supported filesystems are xfs and ext4.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:25:06 +02:00
Alexander Larsson
10083f4140
devicemapper: Probe what filesystem to use when mounting
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:03:19 +02:00
Alexander Larsson
7f5ba068f4
devmapper: Add --storage-opt options for basic devicemapper settings
...
This allows setting these settings to be passed:
dm.basesize
dm.loopdatasize
dm.loopmetadatasize
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:50:07 +02:00