toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,733 Commits 3 Branches 295 Tags
de4a43cde3c4fc4e8bfdf56f0b2342572aaaf951
Commit Graph

8733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johan Euphrosine de4a43cde3 docs/google: fix code blocks 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: e2119f3050b225ccaf25990e5d6714dae2de7afe
Component: engine
 2014-06-06 13:11:21 -07:00
Victor Vieux b1b5a3ab57 Merge pull request #6238 from tiborvass/merge_release_v0.12.0 
Merge release v0.12.0
Upstream-commit: 5d07362a842a67c48158dfe0edd46aecfd6f66e0
Component: engine
 2014-06-06 11:55:50 -07:00
Tibor Vass 72c4f26c6c Change version to 0.12.0-dev 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: c95f77866c18fcd75507bf72df405bc61ba50bb0
Component: engine
 2014-06-06 11:45:57 -07:00
Michael Crosby 7b45d705e3 Merge pull request #6230 from tiborvass/bump_v0.12.0 
Bump version to v0.12.0
Upstream-commit: c624caa949a19b9fe7802976c6f4bb98fa029da4
Component: engine
 2014-06-06 11:41:06 -07:00
Tibor Vass 6a34dc5f38 Bump version to v0.12.0 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 14680bf724161785d164fd99de36e3eb03a823ef
Component: engine
 2014-06-05 17:59:19 -07:00
Tibor Vass 2af79a6c4e Merge pull request #6228 from vieux/fix_restart_links 
Fix restart links
Upstream-commit: c06f32a7b9cb1cd40265a1cd42d52ed246cbe1e7
Component: engine
 2014-06-05 17:54:27 -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
James Turnbull d76b5bb198 Merge pull request #6226 from fredlf/copyedits 
More minor copy edits, typo fix.
Upstream-commit: 98d44ac491021463636c9f2ce0708f970b77c828
Component: engine
 2014-06-05 17:07:18 -07:00
Tianon Gravi 9b9d6c9913 Merge pull request #6227 from crosbymichael/fix-test-compile 
Don't compile nsinit during tests (it has package main)
Upstream-commit: c6dc8275b2570472518886669c1174746fe7b67f
Component: engine
 2014-06-05 18:06:31 -06:00
Michael Crosby 4a0a27b9ff Don't compile nsinit 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3986bc659be9ff83d521f82e3353b1f73b896cbc
Component: engine
 2014-06-05 17:03:32 -07:00
Fred Lifton fbe9e09f01 More minor copy edits, typo fix. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
Upstream-commit: 762c52850177d0eb9148e5f3a0df90c79043246b
Component: engine
 2014-06-05 16:55:32 -07:00
Michael Crosby 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
Michael Crosby fac88c9900 Merge pull request #6221 from crosbymichael/no-unmount 
Move remount as private to the graph drivers
Upstream-commit: c239c8ad9d183a03fd93948061ae79f81c335c32
Component: engine
 2014-06-05 16:51:10 -07: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 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
unclejack 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
James Turnbull 4092b1735f Merge pull request #6182 from mheon/fix_manpage_issue 
Clarify manpages on docker start
Upstream-commit: 19ef3ff1126be62c6dcb0a24a797a09ad251e5bb
Component: engine
 2014-06-05 15:15:50 -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
Sven Dowideit 429e3bef53 Merge pull request #6219 from cpuguy83/fix_ssh_example_docs_root_login 
Fixes broken ssh server example
Upstream-commit: a2c553bd6bb223fb5449f9875a8e2f40abb14994
Component: engine
 2014-06-05 15:02:43 -07:00
Sven Dowideit 6d3f7f2239 Merge pull request #6222 from SvenDowideit/pr_out_reflow_to_80_columns 
Initial edits to home page
Upstream-commit: 64ce33268cda1210017f0a226846b004616e0915
Component: engine
 2014-06-05 14:58:29 -07:00
SvenDowideit cefcc5a5b7 reflow to 80 columns 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: abcb724ed90a1e68234bd9c1c0d9263557b67026
Component: engine
 2014-06-06 07:58:05 +10:00
Fred Lifton ccac994016 Initial copy edits to home page. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: SvenDowideit)
Upstream-commit: 09b19752e028f91644e3e2801f0fd616c4adc683
Component: engine
 2014-06-06 07:58:04 +10:00
Sven Dowideit 87c7a13363 Merge pull request #6223 from jamtur01/rl 
Revert "Initial links for Docker Hub rename"
Upstream-commit: 6be75947abd788773ae02ffd9e2a4dd7dcd3e871
Component: engine
 2014-06-05 14:56:12 -07:00
James Turnbull 1492ef2c06 Revert "Initial links for Docker Hub rename" 
This reverts commit 2819677c215bd409b4ce4da51f0ddfb303760796.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: fad14eda3af8b4ffa59f74dc5c6583d22bcc9471
Component: engine
 2014-06-05 14:52:06 -07:00
James Turnbull a0d36a9d79 Merge pull request #6156 from jamtur01/links 
Initial link update for Docs
Upstream-commit: 6fa3acc96c2d39c75193f140c5ed2e654cc77208
Component: engine
 2014-06-05 14:46:33 -07:00
Victor Vieux bd1ced896d Merge pull request #6220 from vieux/fix_redirect 
Only forward auth to trusted locations
Upstream-commit: cedab4d06a6e74d6567799ac4ad494884a8a9b13
Component: engine
 2014-06-05 14:34:37 -07:00
Michael Crosby 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
Michael Crosby 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
Victor Vieux 51ac70314e only forward auth to trusted locations 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: a12453186323372f4d4e23980d3f1caa2de91e5a
Component: engine
 2014-06-05 19:47:33 +00:00
Matthew Heon cdfc620fa1 Clarify effect of docker start on started container in CLI docs 
This behavior changed from v0.9 to v0.10, so document it to prevent
any confusion.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: d08c965e2c6ed223e10773ac77f95b7b6e273e0a
Component: engine
 2014-06-05 15:08:54 -04:00
cpuguy83 15bbcd7308 Fixes broken ssh server example 
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 04620e01547d6526023b49494919f3eb3fcf900a
Component: engine
 2014-06-05 14:10:52 -04:00
Sven Dowideit af0d43a64a Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc 
Fixes incorrect API spec for items moved to HostConfig
Upstream-commit: 734d108ed244b34a1111d864dc9b53046e3dc0ec
Component: engine
 2014-06-05 10:33:16 -07:00
cpuguy83 81d8873d1e Fixes incorrect API spec for items moved to HostConfig 
DNS and VolumesFrom were moved to HostConfig and as such are part of the
container start and not create.
For some reason 0.10 docs are correct (except for a missing quote in the
JSON") but 0.11 and latest are not.

Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 8c646ebf16bd0e2618cbca430bc129ee7416a21c
Component: engine
 2014-06-05 09:50:27 -04: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
Alexander Larsson 28ddc63894 devicemapper: Probe what filesystem to use when mounting 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 10083f414017636065aa50610f07784738df8e7a
Component: engine
 2014-06-05 11:03:19 +02:00
Alexander Larsson cb7dedffd7 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)
Upstream-commit: 7f5ba068f438ee159bfca7396de4987bcae45809
Component: engine
 2014-06-05 10:50:07 +02:00
Alexander Larsson 83cd706353 Add --storage-opt graph driver option and pass through to driver 
This lets you add storage specific options for the daemon.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 822ea97ffcf10645720bb93108a60f8b9ce9931d
Component: engine
 2014-06-05 10:42:27 +02:00
Alexander Larsson d381e276cf devmapper: Fail init with ErrNotSupported if simple devmapper call fails 
If we can't even get the current device mapper driver version, then
we cleanly fail the devmapper driver as not supported and fall back
on the next one.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 948e54ac455f88c79524dcf117df80f2d4c3f96c
Component: engine
 2014-06-05 10:42:27 +02:00
Alexander Larsson 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
Victor Vieux 10c138b211 Merge pull request #6026 from vmarmol/nsenter 
Adding initial version of C-based nsenter for allowing execin in libcontainer.
Upstream-commit: 7e96f8de1c65d414dd2c5039bf5953ae10cf236f
Component: engine
 2014-06-04 19:06:27 -07:00
Victor Vieux 1040100018 Merge pull request #6210 from tiborvass/fix_doc_remove_insert_remote_api 
Move doc section in Remote API about removing insert from v1.11 to v1.12
Upstream-commit: fe706af3c0569f378dab454b6083b91ea57be84d
Component: engine
 2014-06-04 18:31:55 -07:00
Tibor Vass d0a1649e4a Move doc section in Remote API about removing insert from v1.11 to v1.12 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 0d1906feea511cbfd1695adbb0b39dfdfae2caeb
Component: engine
 2014-06-04 18:30:10 -07:00
Tibor Vass e9e3cbb2bd Merge pull request #6208 from crosbymichael/remove-insert 
Totally remove insert feature
Upstream-commit: 894814f708a324af97370cf576d1d09a53d87480
Component: engine
 2014-06-04 18:17:23 -07:00
Victor Marmol d5a48cabdd Merge pull request #1 from crosbymichael/nsenter-path 
Move environment loading to nsenter
Upstream-commit: a0137e104ce6789f64baa1eecbcd625ed5cac9cb
Component: engine
 2014-06-04 18:14:12 -07:00
Michael Crosby 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
Michael Crosby 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
Victor Marmol 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