p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,206 Commits 2 Branches 295 Tags
bc68396213e78e924eb7ba852a6d94de4ca4f50a
Commit Graph

231 Commits

Author SHA1 Message Date
Alexandr Morozov
53991068e0 Use State waiting functions 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 57d86a5619adae5e08e0e28fba99f6a7c2f5ee54
Component: engine
 2014-06-27 15:07:40 +04:00
Alexandr Morozov
724bb65de7 State refactoring and add waiting functions 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 47065b904559f36e83b924007c375f2de0f31af0
Component: engine
 2014-06-27 15:05:48 +04:00
Tibor Vass
88e1677028 Merge pull request #6703 from crosbymichael/update-libcontainer-dep 
Update libcontainer to 53cfe0a1eba9145bf5329abb
Upstream-commit: 67f6b0fd43a7f4c5c1b07373f73568c0444145a5
Component: engine
 2014-06-26 21:20:59 -04:00
Tibor Vass
3090f44756 Merge pull request #6579 from vieux/dockerignore 
Rebased Dockerignore
Upstream-commit: 6e3fe9314801baf9e4d162619fabfca5b61456fa
Component: engine
 2014-06-26 21:00:43 -04:00
Michael Crosby
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
Michael Crosby
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
Travis Cline
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
Victor Vieux
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
unclejack
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
Solomon Hykes
9a4ed6541e Merge pull request #6218 from vieux/update_maintainers 
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
 2014-06-25 17:00:32 -07:00
Victor Vieux
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
Michael Crosby
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
unclejack
df9f902ba5 Merge pull request #6648 from LK4D4/truncindex_bench 
Truncindex benchmarks
Upstream-commit: c4dbd4f7c0ff3f33705db21a709c3475ebe0770b
Component: engine
 2014-06-24 22:10:33 +03:00
Michael Crosby
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
Michael Crosby
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
LK4D4
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
Kato Kazuyoshi
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
Sven Dowideit
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
unclejack
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
Michael Crosby
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
Michael Crosby
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
Dinesh Subhraveti
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
Victor Vieux
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
Victor Vieux
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
Rick van de Loo
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
Tibor Vass
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
cyphar
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
Tibor Vass
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
LK4D4
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
Victor Vieux
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
Victor Vieux
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
Victor Vieux
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
Solomon Hykes
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
LK4D4
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
Michael Crosby
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
Victor Vieux
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
Michael Crosby
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
Alexandr Morozov
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
Alexandr Morozov
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Victor Vieux
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
Victor Vieux
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
Michael Crosby
12d535e2c7 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)
Upstream-commit: 3609b051b88565c0fe0615fd47ddb48eed549d27
Component: engine
 2014-06-05 16:02:25 -07:00
Tibor Vass
9fb60c3559 Ensures files get closed properly. Closes #6213 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: b1ac791d8426cd7b6fb5a19f5e918b26c83d83f6
Component: engine
 2014-06-05 15:13:43 -07:00
Alexander Larsson
3ee07ce41f 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)
Upstream-commit: 0434a2ce64c0ce07e97e9a516cef226be67d5f5b
Component: engine
 2014-06-05 11:45:59 +02:00
Alexander Larsson
af11ee865f 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)
Upstream-commit: a226168a8b877d632cb87c95dd0288f6092b9d8f
Component: engine
 2014-06-05 11:45:55 +02:00
Alexander Larsson
42f2781e59 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)
Upstream-commit: 807bc2cd049d97f31eab54ce3d5719d63240e3e7
Component: engine
 2014-06-05 11:25:06 +02:00