3ff62eb227
Merge pull request #3963 from unclejack/update-contributing
...
Update issue filing & PR submission instructions
2014-02-06 14:17:07 -05:00
e634f23940
Add "ONBUILD" highlighting to our vim syntax file
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-06 11:12:57 -07:00
1a12e9fbc6
Merge pull request #3972 from crosbymichael/fix-release-panic
...
Check for nil information return
2014-02-06 19:39:07 +02:00
d5d948a038
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)
2014-02-06 09:28:30 -08:00
983edd40fa
Merge pull request #3956 from crosbymichael/no-ping-from-client
...
Do not ping registry from the cli
2014-02-06 08:14:35 -08:00
2a1609d618
Merge pull request #3945 from crosbymichael/fix-brigeiface
...
Fix bad rebase where bridgeiface was removed
2014-02-06 07:38:32 -08:00
2c82fd93d8
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)
2014-02-06 13:14:49 +01:00
7e25cd5891
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)
2014-02-06 13:14:49 +01:00
b95c560fdd
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)
2014-02-06 13:14:42 +01:00
bbe382bec4
Check for nil information return
...
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-06 03:18:12 -08:00
1f6000eaa0
update issue filing & PR submission instructions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-06 11:06:25 +02:00
09702f4c31
Merge pull request #3954 from ibuildthecloud/broken-1.6-images-api
...
Fix broken images API for version <1.7
2014-02-06 10:25:14 +02:00
4f7d325c0a
Merge pull request #3888 from therealprologic/master
...
Added installation docs for CRUX as a Docker Host.
2014-02-06 18:15:49 +10:00
55e5e37c4f
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)
2014-02-05 19:09:55 -07:00
e2eace9715
Do not ping registry from the cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-05 16:49:43 -08:00
f5d028c838
Added installation docs for CRUX as a Docker Host.
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
2014-02-06 10:37:33 +10:00
9dd92a9823
Merge pull request #3944 from joeshaw/patch-1
...
Always download things over https
2014-02-05 13:56:41 -08:00
f9f30f1ced
Merge pull request #3938 from SvenDowideit/workdir-doc-tweak
...
be a little more explicit about what WORKDIR does
2014-02-05 13:54:49 -08:00
3841e88625
Always download things over https
...
Docker-DCO-1.1-Signed-off-by: Joe Shaw <joe@joeshaw.org> (github: joeshaw)
2014-02-05 15:46:41 -05:00
dca21dfac7
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)
2014-02-05 21:27:12 +01:00
63d4b293e7
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)
2014-02-05 21:27:12 +01:00
347dc39427
Fix bad rebase where bridgeiface was removed
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-05 11:20:59 -08:00
7fb8738839
Merge pull request #3941 from crosbymichael/merge_release_v0.8.0
...
Merge release v0.8.0
2014-02-05 14:16:25 -05:00
5cb45544c6
Change version to v0.8.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-05 09:54:34 -08:00
3a8fff964c
Merge branch 'release' into merge_release_v0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-05 09:54:15 -08:00
fe6406b0f2
Merge pull request #3916 from crosbymichael/bump_v0.8.0
...
Bump to v0.8.0
2014-02-05 12:49:41 -05:00
a17d7d9a73
be a little more explicit about what WORKDIR does
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-05 13:26:49 +10:00
880dc34c0e
Merge pull request #3933 from proppy/patch-1
...
docs/installation/google: remove -mtu flag
2014-02-04 17:24:18 -08:00
650200239b
docs/installation/google: remove -mtu flag
2014-02-04 17:19:05 -08:00
d43c85961f
remove mention of #docker-meeting
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-05 10:15:22 +10:00
cc3a8c8d8e
Bump to version 0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-04 16:08:57 -08:00
501d0499f8
Merge pull request #3928 from metalivedev/fixheadings
...
Fixes headings in Table of Contents, link from FAQ.
2014-02-04 14:59:24 -08:00
fa0afe89ad
Merge pull request #3929 from ostezer/master
...
mac-installation-docs: Update the installation dir.
2014-02-04 14:51:05 -08:00
5a49fba15e
Merge pull request #3927 from tianon/release-checklist-mention-contributors
...
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
2014-02-04 14:46:41 -08:00
aed37e70b9
mac-installation-docs: Update the installation dir.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-02-05 00:44:55 +02:00
18b896e0f0
Fixes headings in Table of Contents, link from FAQ.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-02-04 14:16:27 -08:00
9fbb134d87
Merge pull request #3926 from tianon/update-mailmap
...
Update .mailmap and AUTHORS
2014-02-04 13:33:41 -08:00
bd85631ca5
Update .mailmap and AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-04 13:40:56 -07:00
3455c6f470
Merge pull request #3918 from ostezer/master
...
docs: Requirements And Installation on Mac OS X 10.6 Snow Leopard
2014-02-04 12:38:51 -08:00
bac7e741bf
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)
2014-02-04 13:34:24 -07:00
a9b325e5b0
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)
2014-02-04 22:26:06 +02:00
81b2940c89
Merge pull request #3254 from shykes/onbuild
...
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
2014-02-04 11:38:27 -08:00
ded9e0d6df
builder: clearly display ONBUILD triggers during a build.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-02-04 19:11:56 +00:00
6ed7461eac
Merge pull request #3557 from unclejack/improve_vagrantfile
...
improve the Vagrant VMs: bump RAM to 512 MB & correct forwarded ports
2014-02-04 10:23:52 -08:00
495135b68a
Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fix
...
iptables: use dest_addr and dest_port for public port FORWARD rule
2014-02-04 10:06:43 -08:00
23959e6cf8
Merge pull request #3919 from SvenDowideit/missing-quote
...
missing quote quota
2014-02-04 10:03:26 -08:00
ea63ade772
iptables: use dest_addr and dest_port for public port FORWARD rule
...
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
2014-02-04 11:32:50 -06:00
297001f515
improve the Vagrant VMs
...
This bumps the VM memory and corrects forwarded ports when they're used
already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-04 12:26:14 +02:00
3fda1819ee
Merge pull request #3920 from SvenDowideit/hack-spelling
...
Fix hack/MAINTAINERS.md spelling problems
2014-02-03 21:34:51 -08:00
df4682907d
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-02-04 15:32:19 +10:00
Michael Crosby
Tianon Gravi
unclejack
Guillaume J. Charmes
Guillaume J. Charmes
Alexander Larsson
unclejack
Sven Dowideit
Darren Shepherd
James Mills
Andy Rothfusz
Joe Shaw
Sven Dowideit
Johan Euphrosine
O.S.Tezer
Solomon Hykes
Josh Poimboeuf