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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
640e5569af
Merge pull request #3888 from therealprologic/master
...
Added installation docs for CRUX as a Docker Host.
Upstream-commit: 4f7d325c0ac193cf9ac8e1241c50741cf47978bc
Component: engine
2014-02-06 18:15:49 +10:00
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
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
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
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
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
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
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
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
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
07ecc13c54
Merge pull request #3941 from crosbymichael/merge_release_v0.8.0
...
Merge release v0.8.0
Upstream-commit: 7fb8738839a1096e15679dddbff7c9e0e44f1c86
Component: engine
2014-02-05 14:16:25 -05:00
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
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
9b7c01efab
Merge pull request #3916 from crosbymichael/bump_v0.8.0
...
Bump to v0.8.0
Upstream-commit: fe6406b0f2043c83ca061d15ceaa3cb4689d330d
Component: engine
2014-02-05 12:49:41 -05:00
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
0e2fa63561
Merge pull request #3933 from proppy/patch-1
...
docs/installation/google: remove -mtu flag
Upstream-commit: 880dc34c0e353c5749c87666f27f2e4794dd3270
Component: engine
2014-02-04 17:24:18 -08:00
0d35109949
docs/installation/google: remove -mtu flag
...
Upstream-commit: 650200239b1bd5182524b9a0edf7f9981ab053b2
Component: engine
2014-02-04 17:19:05 -08:00
5a4e6a3400
remove mention of #docker-meeting
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: d43c85961f3378607ace3e05dbab43ab2481699c
Component: engine
2014-02-05 10:15:22 +10:00
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
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
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
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
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
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
ea753e2788
Merge pull request #3926 from tianon/update-mailmap
...
Update .mailmap and AUTHORS
Upstream-commit: 9fbb134d87c9c0c045db6237f79f177280f5efc5
Component: engine
2014-02-04 13:33:41 -08:00
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
9b110c40d9
Merge pull request #3918 from ostezer/master
...
docs: Requirements And Installation on Mac OS X 10.6 Snow Leopard
Upstream-commit: 3455c6f47085cfdc519db1b8fbd0955528c2e630
Component: engine
2014-02-04 12:38:51 -08:00
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
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
6e6e6b6ab6
Merge pull request #3254 from shykes/onbuild
...
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
Upstream-commit: 81b2940c896269fe1da9079852a5ff13ff8bbb96
Component: engine
2014-02-04 11:38:27 -08:00
3b6d4254e4
builder: clearly display ONBUILD triggers during a build.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ded9e0d6dfbcfe0f2ccd448baf0acb4378365bac
Component: engine
2014-02-04 19:11:56 +00:00
de9bfe6086
Merge pull request #3557 from unclejack/improve_vagrantfile
...
improve the Vagrant VMs: bump RAM to 512 MB & correct forwarded ports
Upstream-commit: 6ed7461eacd5b9c85ccc9a05c3e030b0cad4cb3d
Component: engine
2014-02-04 10:23:52 -08:00
