docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
6,110 Commits 12 Branches 296 Tags
a58e2667ed68496c819e7e848dc40530bfbfa55e
Commit Graph

5642 Commits

Author SHA1 Message Date
Michael Crosby
a58e2667ed Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer 
pkg: systemd: add initial MAINTAINERS
Upstream-commit: 36aafeb0b49b096df6967b7681a7676b36abbc3b
Component: engine
 2014-02-07 12:32:21 -05:00
James Turnbull
f006ee4708 Added Security FAQ security 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 55b74bfe469115f25a52c6ad48b13eb9c7e6197c
Component: engine
 2014-02-07 01:42:11 +01:00
Guillaume J. Charmes
e7b56195a8 Merge pull request #3948 from alexlarsson/devmapper-unmount 
Devmapper cleanup and unmount fix
Upstream-commit: d0fc598ce2d4d4d4d2cc6b530ffaf74978d6d0d9
Component: engine
 2014-02-06 15:10:06 -08:00
Alexander Larsson
3959ecf0a9 devmapper: Fix MountDevice for non-existing Device 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 693d3f8c6ab4c9fed5fe4c5ac5fcb44568fe1638
Component: engine
 2014-02-06 23:08:17 +01:00
Alexander Larsson
4c4ba56ea4 devmapper: Fix UnmountDevice for non-existing device 
Properly error out if passed an id that doesn't exist.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 304e33a2fe2d006cc1063c8060c6e22c9ade3d59
Component: engine
 2014-02-06 22:26:09 +01:00
Tianon Gravi
e004860fa8 Merge pull request #3966 from asbjornenge/updated_tmlang 
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
Upstream-commit: 84285f7539f5825db62df3e3995d3de7b96b0a89
Component: engine
 2014-02-06 14:20:52 -07:00
Tianon Gravi
bd43778b40 Merge pull request #3977 from tianon/vim-onbuild 
Add "ONBUILD" highlighting to our vim syntax file
Upstream-commit: 1c6f909d329c913c5f10173feeb8b618f2c2be19
Component: engine
 2014-02-06 14:20:09 -07:00
Brandon Philips
bd67bce023 pkg: systemd: add initial MAINTAINERS 
I volunteered for pkg/systemd MAINTAINER and there were no objections
during the #docker-dev meeting. For context I wrote most of the stuff in
here and wrote the dependent calls in api.go. Plus, I actively test the
code via CoreOS.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 15711ed670e8ab59611030ea1191189ad495ea63
Component: engine
 2014-02-06 12:04:35 -08:00
Daniel Mizyrycki
20c26b1bdf docker-ci: Add new docker coverage report 
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
Upstream-commit: 25d87553f678e247b3036db7804599624191dfd1
Component: engine
 2014-02-06 11:59:29 -08:00
Asbjørn Enge
b27e52cf64 Added support for single quoted strings 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: f6c6f303f84773987afd5f83d9c1e2170fa140e3
Component: engine
 2014-02-06 20:50:36 +01:00
Asbjørn Enge
f652ab5b5e Improved regex 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 888e8da2832871b10f60ba9d3058fc442812ca17
Component: engine
 2014-02-06 20:48:15 +01:00
Asbjørn Enge
169c246340 Updated readme 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 3d86f07f8776fd97f1f75e99ad535a9b6543059a
Component: engine
 2014-02-06 20:38:25 +01:00
Asbjørn Enge
94f2865699 Added suppport for the ONBUILD instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 647db3938d27d832d09f622b304c7bd23bc00d74
Component: engine
 2014-02-06 20:38:20 +01:00
Asbjørn Enge
a0b0e2b023 Removed the YAML file since I wasn't using it 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: e95bb0b4a9ef642d02f5549ba8375f9952eff0b3
Component: engine
 2014-02-06 20:37:49 +01:00
Asbjørn Enge
8a1a839738 Added Dockerfile.tmPreferences for hotkey commenting 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 6561d65438ed2e10143a5a8bac32bf62d5d8950d
Component: engine
 2014-02-06 20:35:45 +01:00
Michael Crosby
1f0d29026d Merge pull request #3974 from creack/3967-add_content_type-fix 
Add json content type to /containers/json api endpoint
Upstream-commit: 22aeae34c1d257956e6201697e30dd64028a1182
Component: engine
 2014-02-06 14:18:00 -05:00
Michael Crosby
3d83357a3e Merge pull request #3963 from unclejack/update-contributing 
Update issue filing & PR submission instructions
Upstream-commit: 3ff62eb2271615534db1f5a9e197727fa7b8b1bb
Component: engine
 2014-02-06 14:17:07 -05:00
Tianon Gravi
fc2d4abd37 Add "ONBUILD" highlighting to our vim syntax file 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e634f2394085d5dc7e716553b330acb8694bf6d3
Component: engine
 2014-02-06 11:12:57 -07:00
unclejack
1a36cfd179 Merge pull request #3972 from crosbymichael/fix-release-panic 
Check for nil information return
Upstream-commit: 1a12e9fbc665833a96a3b98bef2cf33d2cda4642
Component: engine
 2014-02-06 19:39:07 +02:00
Guillaume J. Charmes
3287c05092 Add json content type to /containers/json api endpoint 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: d5d948a038933251fe39021883b71f3399ab116c
Component: engine
 2014-02-06 09:28:30 -08:00
Guillaume J. Charmes
2709486982 Merge pull request #3956 from crosbymichael/no-ping-from-client 
Do not ping registry from the cli
Upstream-commit: 983edd40fa118a8fe79b83b8ec7238c16949c33e
Component: engine
 2014-02-06 08:14:35 -08:00
Guillaume J. Charmes
297c54c134 Merge pull request #3945 from crosbymichael/fix-brigeiface 
Fix bad rebase where bridgeiface was removed
Upstream-commit: 2a1609d618fc89cd76affe163db4b8dab153ec40
Component: engine
 2014-02-06 07:38:32 -08:00
Alexander Larsson
8a70fd74d7 devmapper: Handle EBUSY while removing 
For some reason we seem to get transient EBUSY when removing
thinp devices, which prohibit removing containers. When
this happens we retry a few times which seems to fix the
issue for me.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 2c82fd93d8a01cc1f53fe861378e6d2dca0486c6
Component: engine
 2014-02-06 13:14:49 +01:00
Alexander Larsson
931e825d56 devmapper: Use removeDeviceAndWait in DeviceSet.removeDevice() 
This makes sure the device is removed just like in deactivateDevice.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 7e25cd5891f84c2fab656c364002290e4b87f934
Component: engine
 2014-02-06 13:14:49 +01:00
Alexander Larsson
d2595404a2 devmapper: Move refcounting to DeviceSet 
We already have some kind of refcounting in DeviceSet, this fleshes
it out to allow it to completely subsume the refcounting in
devmapper.Driver.

This allows us to drop the double refcounting, and the locking inside
devmapper.Driver. This, in particular the locking simplification will
make it easier in the future to parallelize the device mapper.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: b95c560fdda4813319a2377e240592a3261e30ef
Component: engine
 2014-02-06 13:14:42 +01:00
Michael Crosby
79a6ce6a54 Check for nil information return 
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: bbe382bec4b24d8aee09570f2c3920cc1c9710ca
Component: engine
 2014-02-06 03:18:12 -08:00
unclejack
71b42cf15f update issue filing & PR submission instructions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1f6000eaa0d571d34e2c9207692fb82c4a022061
Component: engine
 2014-02-06 11:06:25 +02:00
unclejack
4180ce4fa5 Merge pull request #3954 from ibuildthecloud/broken-1.6-images-api 
Fix broken images API for version <1.7
Upstream-commit: 09702f4c31e2b3899192318659ff59512cb28d8d
Component: engine
 2014-02-06 10:25:14 +02:00
Darren Shepherd
34bf15410e Fix broken images API for version <1.7 
Simple typo, "ID" should be "Id".  This is causing the images response
to not have IDs in it.

Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com> (github: ibuildthecloud)
Upstream-commit: 55e5e37c4f085c0216a3d99dc7e3c3f12c2c7a88
Component: engine
 2014-02-05 19:09:55 -07:00
Michael Crosby
02fa3704fe Do not ping registry from the cli 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e2eace9715253b5254d1596f3ee91e2f61127929
Component: engine
 2014-02-05 16:49:43 -08:00
James Mills
503a038711 Added installation docs for CRUX as a Docker Host. 
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
Upstream-commit: f5d028c83868082049994ad544c99291a117797d
Component: engine
 2014-02-06 10:37:33 +10:00
Andy Rothfusz
720e1e3427 Merge pull request #3944 from joeshaw/patch-1 
Always download things over https
Upstream-commit: 9dd92a9823d7021c20a8c3f596fe2c68129bf6a6
Component: engine
 2014-02-05 13:56:41 -08:00
Andy Rothfusz
246155a392 Merge pull request #3938 from SvenDowideit/workdir-doc-tweak 
be a little more explicit about what WORKDIR does
Upstream-commit: f9f30f1ced0c9dfe5756433ef8240f3f8c8e6d71
Component: engine
 2014-02-05 13:54:49 -08:00
Joe Shaw
381b0e5021 Always download things over https 
Docker-DCO-1.1-Signed-off-by: Joe Shaw <joe@joeshaw.org> (github: joeshaw)
Upstream-commit: 3841e8862596637b904acf7f64b657bf3c9b49b1
Component: engine
 2014-02-05 15:46:41 -05:00
Alexander Larsson
9d46aecf3b devmapper: add and use removeDeviceAndWait helper 
This adds a function that calls the lowlevel removeDevice
and then waits for it to finish.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: dca21dfac77de2bbd69dd5a52b8a2b7816a54367
Component: engine
 2014-02-05 21:27:12 +01:00
Alexander Larsson
3ce6127194 devmapper: Rename DeviceSet.RemoveDevice to DeleteDevice 
"Remove" is a bit overloaded, as it is also what deactivating a
device mapper device is called. Using "delete" is more clear here.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 63d4b293e7c91b8e2ed8da56f338f1bd0a4e1464
Component: engine
 2014-02-05 21:27:12 +01:00
Michael Crosby
8c2801ba38 Fix bad rebase where bridgeiface was removed 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 347dc3942704742c1d24983a1e9cb10ae7ab8839
Component: engine
 2014-02-05 11:20:59 -08:00
Michael Crosby
70c7bbe60f Change version to v0.8.0-dev 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5cb45544c63f3aa87c40ad13f4df77fe7aed1254
Component: engine
 2014-02-05 09:54:34 -08:00
Michael Crosby
0ebc0c4971 Merge branch 'release' into merge_release_v0.8.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3a8fff964cd9d4dd2bff4cd44579b5646d3de3d4
Component: engine
 2014-02-05 09:54:15 -08:00
Sven Dowideit
4946b514fb be a little more explicit about what WORKDIR does 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a17d7d9a73a23dc1fb2269b34418f2c7a645598b
Component: engine
 2014-02-05 13:26:49 +10:00
Johan Euphrosine
0d35109949 docs/installation/google: remove -mtu flag 
Upstream-commit: 650200239b1bd5182524b9a0edf7f9981ab053b2
Component: engine
 2014-02-04 17:19:05 -08:00
Michael Crosby
853d639d70 Bump to version 0.8.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cc3a8c8d8ec57e15b7b7316797132d770408ab1a
Component: engine
 2014-02-04 16:08:57 -08:00
Andy Rothfusz
2ec14b9b9e Merge pull request #3928 from metalivedev/fixheadings 
Fixes headings in Table of Contents, link from FAQ.
Upstream-commit: 501d0499f89f3d775d39552141e002ad139222d2
Component: engine
 2014-02-04 14:59:24 -08:00
Andy Rothfusz
8f864d043a Merge pull request #3929 from ostezer/master 
mac-installation-docs: Update the installation dir.
Upstream-commit: fa0afe89aded86b99a992e567b3e3f0c0320eb45
Component: engine
 2014-02-04 14:51:05 -08:00
Michael Crosby
3264607fba Merge pull request #3927 from tianon/release-checklist-mention-contributors 
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
Upstream-commit: 5a49fba15e069b98a9c1e58af1781d2ab0ee81e2
Component: engine
 2014-02-04 14:46:41 -08:00
O.S.Tezer
e7dbf5bfd0 mac-installation-docs: Update the installation dir. 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: aed37e70b9ca2cff1749fb2de639a11b9c346d67
Component: engine
 2014-02-05 00:44:55 +02:00
Andy Rothfusz
ce01d33e55 Fixes headings in Table of Contents, link from FAQ. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 18b896e0f032b6ec71fc7c5e56b2acd470c0fe50
Component: engine
 2014-02-04 14:16:27 -08:00
Tianon Gravi
062d3a92ee Update .mailmap and AUTHORS 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bd85631ca56d0aaa5293e27048b20b6bfa45e679
Component: engine
 2014-02-04 13:40:56 -07:00
Tianon Gravi
8fbcfcf011 Update RELEASE-CHECKLIST to mention how to get a decent contributors list 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bac7e741bfd1d77ebb742bc1ed3fec6c6f300be3
Component: engine
 2014-02-04 13:34:24 -07:00
O.S.Tezer
8302cc3ec1 docs: Installation on Mac OS X 10.6 Snow Leopard 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: a9b325e5b00095a44617aa4b146e51f048e213ba
Component: engine
 2014-02-04 22:26:06 +02:00