Guillaume J. Charmes
c887dfefdf
Merge pull request #3641 from gfrey/fix_compression
...
detect compressed archives in API /build call
Upstream-commit: 941d4ffa3e8e6c74fd02f3ac81a66c64dda3bc58
Component: engine
2014-01-17 12:02:54 -08:00
Michael Crosby
89d377fc23
Merge pull request #3632 from crosbymichael/stream-cp
...
Stream the cp operation on the client
Upstream-commit: 2f066aef495a63d3d02940ba7c839cc4f3888aed
Component: engine
2014-01-17 11:29:51 -08:00
Michael Crosby
83517b0f69
Replace creating buffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 95df957f73f4e7bb7225111bd4a4b4ff337af529
Component: engine
2014-01-17 11:02:44 -08:00
Michael Crosby
38c89dc581
Stream the cp operation on the client
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fdd8d4b7d9dbc32a76a708d0d51c201cf9c977f0
Component: engine
2014-01-17 10:51:29 -08:00
Victor Vieux
a4e0978f9e
Merge pull request #3637 from crosbymichael/no-panic-on-exec
...
Return error and not panic when cannot exec in dockerinit
Upstream-commit: b4e5bfbf6f17b92a12ed2a8f4fafab53fac5f0ad
Component: engine
2014-01-17 10:42:46 -08:00
Victor Vieux
8aad44e0a2
Merge pull request #3635 from vieux/top_job
...
move Top to a job
Upstream-commit: 6188d7ef66ee41022c596248212c083a850501f2
Component: engine
2014-01-17 10:19:28 -08:00
Gereon Frey
0aa4f1bddd
detect compressed archives in API /build call
...
AFAIK in some previous version it was possible to give a compressed docker file
to the API's build command and that was handled properly (aka compression was
detected and archive uncompressed accordingly). Fails with at least 0.7.5.
Fixed this using the DecompressStream method from the archive package.
Docker-DCO-1.1-Signed-off-by: Gereon Frey <me@gereonfrey.de > (github: gfrey)
Upstream-commit: 4f53722dee6c8ea18a9c30bde2cc6fee24b03d32
Component: engine
2014-01-17 12:21:26 +01:00
Michael Crosby
4679c4e1e7
Return error and not panic when cannot exec in dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 11ef2f0db46b8507007c740300fbf486934aa996
Component: engine
2014-01-16 18:31:21 -08:00
Michael Crosby
929d2cae05
Merge pull request #3624 from tianon/vendor-maintainers
...
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS
Upstream-commit: d6b810c32e72c21a1c7fce5f3157c78457d7a8b2
Component: engine
2014-01-16 17:58:28 -08:00
Tianon Gravi
282dfddd17
Merge pull request #3599 from tianon/fix-install-sed
...
Fix release.sh sed of install.sh so we preserve tests against 'https://get.docker.io/ '
Upstream-commit: 59fe36623bae670f2b973a8e558e57b69197b5d9
Component: engine
2014-01-16 16:54:39 -08:00
Victor Vieux
5507216edb
Merge pull request #3625 from tianon/cleanup-vendor-sh
...
Clean and simplify vendor.sh while making it easier to maintain as well
Upstream-commit: 93ce4d2c0b2dcebd9e763efd0432f45811a3d8d2
Component: engine
2014-01-16 16:42:52 -08:00
Victor Vieux
1de8e12295
clean up test log
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8cbabf2c3e24b6fc0f676a8696133742622f7249
Component: engine
2014-01-16 16:07:42 -08:00
Victor Vieux
58e92d3536
move top job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 812798a7d6659178300d00c470a19c7fe5e68d1c
Component: engine
2014-01-16 16:07:42 -08:00
Victor Vieux
5d03c66795
Merge pull request #3616 from vieux/job_changes
...
move changes to a job
Upstream-commit: 3155ef5cbc99862e9179a99e2a024701efb3aa80
Component: engine
2014-01-16 15:52:57 -08:00
Andy Rothfusz
f6132defa4
Merge pull request #3583 from metalivedev/3497-copyright
...
Update docs/NOTICE copyrights to 2014
Upstream-commit: 2cdbc719c58978bc9d23098b45b473d17956dae0
Component: engine
2014-01-16 12:18:34 -08:00
Tianon Gravi
8f3a13dc70
Clean and simplify vendor.sh while making it easier to maintain as well
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 40b40cffb13758c03eff2cf05b1e5b0aa47bdb9d
Component: engine
2014-01-15 22:20:51 -07:00
Tianon Gravi
d2be7a9f69
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS (since it depends explicitly on hack/vendor.sh)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 98111a4a94b8fdc0a44a1c7bfba2e83fbd0f9534
Component: engine
2014-01-15 22:12:32 -07:00
Victor Vieux
ec9f60e58d
move changes to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 90ec5de430a79ab6b145899a9842c1db968341cf
Component: engine
2014-01-15 17:13:45 -08:00
Victor Vieux
dc5690d6e5
Merge pull request #3615 from vieux/search_job
...
move search to a job
Upstream-commit: 20f36f088c86569d59c8cfe27a99742f31f4fbd3
Component: engine
2014-01-15 17:13:07 -08:00
Victor Vieux
d902ac68ad
move search to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 1669b802cc3e7ce30f05e61630542c88696bbca1
Component: engine
2014-01-15 17:12:48 -08:00
Victor Vieux
e8d5d2ba4b
Merge pull request #3512 from vieux/attach_job
...
move attach to a job
Upstream-commit: 0b7d4c855d8fba3448be8a854257e37eb86c6276
Component: engine
2014-01-15 17:12:14 -08:00
Victor Vieux
547b5e1700
move attach to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e1d8543c7889c1bf456641fa1ee5f676820076b6
Component: engine
2014-01-15 17:11:44 -08:00
Victor Vieux
b703334038
Merge pull request #3617 from dotcloud/fix_insert_display
...
fix docker insert display
Upstream-commit: c4b0eedc9276fe8ee883fa28831ae234b92c7e16
Component: engine
2014-01-15 16:14:59 -08:00
Victor Vieux
0b0bfe2b31
fix docker insert display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 2edcebc0275b726e87575830bb3e96dfb69d7665
Component: engine
2014-01-15 15:41:57 -08:00
Victor Vieux
c92c58088d
Merge pull request #3559 from vieux/insert_job
...
move insert to a job
Upstream-commit: 44b8d8addfbf9ec8e4e5ca9fa91ddf4a543489ae
Component: engine
2014-01-15 15:18:02 -08:00
Victor Vieux
9b65fcb5fa
use the same 'Used' method as before
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a33bc3018bf091725b7faca9a6039a07b6fd0ca7
Component: engine
2014-01-15 14:52:58 -08:00
Victor Vieux
42a6830aeb
move insert to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 0fb8a55753269603eb8f01f725675ceacae79c29
Component: engine
2014-01-15 14:52:58 -08:00
Victor Vieux
61a9b9ca21
Merge pull request #3560 from vieux/copy_job
...
move copy to a job
Upstream-commit: 52ec95f3635b7c9ae4567a473bcc3ffbd657ea7d
Component: engine
2014-01-15 14:48:51 -08:00
Victor Vieux
d269d9c059
move copy to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e2fa3f56df02818f007f929824293f9da6b2db75
Component: engine
2014-01-15 14:48:31 -08:00
Victor Vieux
0ffae81311
Merge pull request #3613 from vieux/deprecated_viz_job
...
move viz to a job
Upstream-commit: f213e2dd6cd6445f59f1e7262783a754a5352dc2
Component: engine
2014-01-15 14:47:56 -08:00
Victor Vieux
80f9949adc
update TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a98e40fa73cdba36b7a7032917e58233ef31ea59
Component: engine
2014-01-15 14:47:35 -08:00
Victor Vieux
e18203d1c4
move viz to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7fbc315aa96f75322643c3e94b418fead6925144
Component: engine
2014-01-15 13:52:35 -08:00
Andy Rothfusz
b04df34a21
Merge pull request #3598 from tianon/fix-vieux-docs-errors-again
...
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
Upstream-commit: cdea7d3b5f64b8d255bab657a79082ec282da96a
Component: engine
2014-01-15 13:42:28 -08:00
Andy Rothfusz
403789e5fb
Merge pull request #3593 from dotcloud/fix_doc
...
fix doc, load and get
Upstream-commit: 0113c087b22c7ffe03c4745bc9d05a0523ecbe5c
Component: engine
2014-01-15 13:33:00 -08:00
Victor Vieux
96b89ef5bc
Merge pull request #3606 from jpallen/1319-fix-race-condition-in-truncindex
...
Add RWMutex lock into TruncIndex to fix race condition when inserting values
Upstream-commit: 78138344a4715729332d1c849eee263c1f6c58f5
Component: engine
2014-01-15 11:41:51 -08:00
Victor Vieux
4a2036105a
fix doc, load and get
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7e00ba03ecd4f1b30e49dbc07160b09929dd786c
Component: engine
2014-01-15 11:12:05 -08:00
Victor Vieux
44317b0896
Merge pull request #3582 from vieux/history_job
...
move history to a job
Upstream-commit: ad5d67555387608b0ee16be2821ac2967ff9e0b4
Component: engine
2014-01-15 11:06:54 -08:00
Victor Vieux
708fd3d625
fix tests & small code improvment
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7898dca8b3d1835d15812bd5249fcfb0de73257b
Component: engine
2014-01-15 11:06:00 -08:00
Guillaume J. Charmes
8714c026e9
Merge pull request #3608 from crosbymichael/merge_release_v0.7.6
...
Merge release v0.7.6 to master
Upstream-commit: 5a91781ef90e0144fe098cdb326dcb929013caf8
Component: engine
2014-01-15 10:41:43 -08:00
Michael Crosby
4439430c2f
Merge branch 'release' into merge_release_v0.7.6
...
Conflicts:
VERSION
hack/make/ubuntu
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3ef777ecbe439b8079715b5879f067b95e31c31b
Component: engine
2014-01-15 09:54:06 -08:00
Michael Crosby
68ff82ba27
Merge pull request #3597 from crosbymichael/bump_v0.7.6
...
Bump to version v0.7.6
Upstream-commit: 4934c35aa115df18867d16943dfb76263c188428
Component: engine
2014-01-15 09:40:43 -08:00
James Allen
82c7a6024b
Add RWMutex lock into TruncIndex to fix race condition when inserting values
...
The idx.index array is overwritten when a new value is inserted to the index.
When two containers are created concurrently, their ids are inserted to the
index and one can overwrite the other leaving one of ids missing from the
index. Adding a RWMutex lock around read/write operations fixes this.
Docker-DCO-1.1-Signed-off-by: James Allen <jamesallen0108@gmail.com > (github: jpallen)
Upstream-commit: 37fcbfa1f4586e4437664239fc271dda31ac1837
Component: engine
2014-01-15 17:30:00 +00:00
Tianon Gravi
e0dd1f369c
Merge pull request #3508 from tutumcloud/seccomp
...
Add capabilities needed by new sysinit to mkseccomp.pl sample list
Upstream-commit: dbf249e23925decac52c0176d716c0ce205d4326
Component: engine
2014-01-14 18:55:53 -08:00
Tianon Gravi
51d6ec0743
Fix release.sh sed of install.sh so we preserve tests against ' https://get.docker.io/ '
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 221454f315a8993a6996ba9867f98bddbdb1eb16
Component: engine
2014-01-14 19:29:02 -07:00
Tianon Gravi
0f4b49bea8
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: eaa9c85511620aa82f1876e1503604f591f00d23
Component: engine
2014-01-14 19:23:30 -07:00
Michael Crosby
b10c6d4b20
Bump to version v0.7.6
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
Component: engine
2014-01-14 17:53:20 -08:00
Tianon Gravi
d7b1a1cd7e
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
Upstream-commit: d103b6f6df74a9fe54b6af747c497641f5b19937
Component: engine
2014-01-14 17:29:25 -08:00
Tianon Gravi
ae761af29a
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
Upstream-commit: 07b50a90a8e7380b781d75dda3773eb23cafb131
Component: engine
2014-01-14 17:27:51 -08:00
Tianon Gravi
e593ed8d0c
Add ca-certificates to our package Recommends
...
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
Upstream-commit: 75293b12b36b3eef6706cf85f291be96500a40da
Component: engine
2014-01-14 17:27:34 -08:00
Fabio Falci
6b97b22177
Use https to get the latest docker version
...
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.
Fix #3570
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: crosbymichael)
Upstream-commit: 734b4566df879c2c071a9785d69b2c9c51d76b06
Component: engine
2014-01-14 17:27:12 -08:00
