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
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
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
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
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
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
ef8372387f
Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fix
...
iptables: use dest_addr and dest_port for public port FORWARD rule
Upstream-commit: 495135b68ad95844b451decd9910bf7a4869c853
Component: engine
2014-02-04 10:06:43 -08:00
36c86dc9b0
Merge pull request #3919 from SvenDowideit/missing-quote
...
missing quote quota
Upstream-commit: 23959e6cf8a002c6607b692c7bd89035f59b2c39
Component: engine
2014-02-04 10:03:26 -08:00
126d36548e
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)
Upstream-commit: ea63ade772445591e78b42a36fa0dcfffa4a9f1a
Component: engine
2014-02-04 11:32:50 -06:00
79580c7340
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)
Upstream-commit: 297001f51560b1172b529a79480b02534fc53ba0
Component: engine
2014-02-04 12:26:14 +02:00
350ca55e57
Merge pull request #3920 from SvenDowideit/hack-spelling
...
Fix hack/MAINTAINERS.md spelling problems
Upstream-commit: 3fda1819ee26857e4b30d0d033fd546eab77d6b6
Component: engine
2014-02-03 21:34:51 -08:00
b5a2f94fbf
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: df4682907ddc41084bf193b863ff9da796b8e102
Component: engine
2014-02-04 15:32:19 +10:00
7de51c3acf
missing quote quota
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 64426c74f2599799bd39d04a28d43a05af7624a4
Component: engine
2014-02-04 15:29:47 +10:00
090d1571e4
Merge pull request #3897 from sandaya/master
...
Update mkimage-arch.sh to set proper permissions on rootfs directory
Upstream-commit: cb0ac55b5b9fa3eed064eea5b954ccb16b2571e7
Component: engine
2014-02-03 18:42:58 -08:00
19172f19fc
Update mkimage-arch.sh
...
mktemp creates a root directory ("/") with permissions set to 700. Default should be 755 so other users in the container can access its subdirs (e.g http user for nginx for /srv/http/test/index.html).
Docker-DCO-1.1-Signed-off-by: Samuel Andaya <samuel@andaya.net > (github: sandaya)
Upstream-commit: 736bf3f7e6ae4a80cc85c846a4d5d074a325c9f4
Component: engine
2014-02-03 21:26:47 -05:00
eaeb410e5e
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 9f994c96468e2495a2dc118355b6565e7dac0f44
Component: engine
2014-02-04 01:31:19 +00:00
06516f2793
Builder: extract the execution of a single build step into buildFile.BuildStep
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: a51f5a287b7b393b23e27787f090575b30cbb68a
Component: engine
2014-02-04 01:23:01 +00:00
95ec5d6cac
Merge pull request #3915 from crosbymichael/no-double-put
...
No no put put
Upstream-commit: b5d6208ccf61e1503af3ca8b577b20392fede3d6
Component: engine
2014-02-03 16:40:44 -08:00
ceeacc939a
Merge pull request #3887 from proppy/detect-network-mtu
...
docker: detect defaultNetworkMtu from default route
Upstream-commit: b56440fa2491505aa239b060faacfc12ac23d3c7
Component: engine
2014-02-03 16:35:15 -08:00
a1339728ea
Merge pull request #3188 from keyvanfatehi/vagrant-port-forwarding-list
...
Vagrantfile port forwarding made more flexible (w/ comments)
Upstream-commit: 5fcd4efd267450e6f4c44f1ce3bfc8d9067e027a
Component: engine
2014-02-03 16:29:47 -08:00
8f61d5e8bf
Fix unmounts out of container export funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 02fdc194fc726ef2ce1fa4303e121abd277f8d32
Component: engine
2014-02-03 16:14:16 -08:00
0cee6d0d01
Do not call Put twice and do not call it on defer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d277a4c0f811e86179770f5098b30adf065567c8
Component: engine
2014-02-03 16:14:02 -08:00
a5869c9f8d
Merge pull request #3883 from metalivedev/fix-3879
...
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
Upstream-commit: 8beca66741c74fa385fe7b8f91e7a73f4342cf90
Component: engine
2014-02-03 16:09:54 -08:00
b81da2dad7
Vagrantfile port forwarding usages documented. Added usage via envvar FORWARD_PORTS for custom port or list of comma-separated ports
...
Docker-DCO-1.1-Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com > (github: keyvanfatehi)
Upstream-commit: d8718e435dfab7052bfd04a1494b1ad34c33cc17
Component: engine
2014-02-03 16:07:52 -08:00
2e2c23075e
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: fca2f3e742d699688c9891ccf9dd8e58591aed08
Component: engine
2014-02-03 16:06:29 -08:00
dbbc9e5b0b
docs/cli: add mtu option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: ab1482e9c25b3c27b48d97ac84e60efb39ae8af7
Component: engine
2014-02-03 16:01:38 -08:00
0da08f6176
docker/config: update -mtu flag default
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 92e61f89aad35c3103e0db1c6dacecc0c588bd2e
Component: engine
2014-02-03 15:36:39 -08:00
2b1dbf920f
networkdriver: add ErrNoDefaultRoute
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 1b9c5edc6c7acbe894c4b2db3e3e4a1f1353ccc5
Component: engine
2014-02-03 14:27:59 -08:00
10838a4c46
Merge pull request #3908 from crosbymichael/fix-login-prompt
...
Fix login prompt on push and pull because of error message
Upstream-commit: 4e9164ff5f84fd9228faca5e6bbe4729b6946b14
Component: engine
2014-02-03 14:19:14 -08:00
d097de6654
Merge pull request #3911 from crosbymichael/fix-remove-volume
...
Fix comparing binds and volume ids from other containers
Upstream-commit: a9860d85530e0cb69d08cbab674fbcb503be5cc1
Component: engine
2014-02-03 14:03:57 -08:00
