Frederick F. Kautz IV
d9f05e38d8
Removing sudo
...
Upstream-commit: 7267c4b746ad3b86d1174aeed4c06679476e8a27
Component: engine
2013-11-14 05:53:53 +00:00
Frederick F. Kautz IV
04362619c5
Adding a makefile
...
Upstream-commit: 26533eb2c419155b93e3f403d081fb3c52d4dc45
Component: engine
2013-11-14 05:34:25 +00:00
¨Sven
7b5ae8dd36
thankyou @tomdz - I forgot about URL based ADDs
...
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
2013-11-14 14:53:55 +10:00
Vinod Kulkarni
7c37de4a14
Improvise documentation for builder.rst / VOLUME command
...
Upstream-commit: 37abc07852874939aabe7ba9a346d4d893e40409
Component: engine
2013-11-14 09:54:31 +05:30
Andy Rothfusz
d8cd1b4245
Merge pull request #2688 from dhrp/doc-layout-dotcloud-to-docker-inc
...
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added Read the Docs.
Upstream-commit: 61abc3f8ac89bd3b238a7ceaf26fa004c462848b
Component: engine
2013-11-13 18:31:21 -08:00
Andy Rothfusz
e96e8ebc75
Merge pull request #2661 from rogaha/links_docs
...
- Added a doc about Links and Container Naming
Upstream-commit: 5fc56b6b47ede3f6c86177fa315743196854412b
Component: engine
2013-11-13 18:15:25 -08:00
Andy Rothfusz
35545fd6bb
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
...
Upstream-commit: 059950b095a48c254a9f407f2bff13eaab7a7a1c
Component: engine
2013-11-13 17:45:22 -08:00
Michael Crosby
cfec1cc83c
Close sparse files when done
...
Upstream-commit: bbc9fc79072bc259371aa96958336baaf8b53638
Component: engine
2013-11-13 17:05:32 -08:00
Michael Crosby
64a84d3816
Merge pull request #27 from shykes/refactor_dm
...
Add more dm unit tests
Upstream-commit: 7682ec04cd0a1b3a8244fe048ae20976404110f1
Component: engine
2013-11-13 16:50:26 -08:00
Guillaume J. Charmes
30fa838234
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
...
Upstream-commit: 590465b3952b008436193fc960a1d076071b1cad
Component: engine
2013-11-13 16:47:37 -08:00
Guillaume J. Charmes
ef863f235c
More dm unit tests
...
Upstream-commit: 05d70cbcf4ebf30b11d54a177e47649e4e229403
Component: engine
2013-11-13 16:46:10 -08:00
Thatcher Peskens
687d57d2f0
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added link to Read the Docs for giving them credit to hosting us. (Thanks Read The Docs!)
...
Upstream-commit: 9ab85f4d1220d04a3b682d5612ff27db5983f5d3
Component: engine
2013-11-13 16:09:23 -08:00
Michael Crosby
934d4ff883
Merge pull request #26 from shykes/refactor_dm
...
Refactor dm
Upstream-commit: 539708aa8afeeb2c55ed9cb25948ff44f6440df5
Component: engine
2013-11-13 15:45:58 -08:00
Guillaume J. Charmes
de8a847f51
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
...
Upstream-commit: 3aaef96e3677a08aa3ca175941afcc867c1aab7c
Component: engine
2013-11-13 15:44:13 -08:00
Guillaume J. Charmes
a6f6a49815
Merge pull request #25 from crosbymichael/add-aufs-diff-test
...
Add test for ApplyDiff
Upstream-commit: 921e2e9ae233ac4d3227b4d3c2c435e459672897
Component: engine
2013-11-13 15:43:26 -08:00
Guillaume J. Charmes
c2fdc4428e
Merge pull request #24 from crosbymichael/dm-tests
...
Add device mapper tests for driver.go
Upstream-commit: b50838c359ccf73b7fe2bff83b76db6d01d47643
Component: engine
2013-11-13 15:41:59 -08:00
Guillaume J. Charmes
e69802932f
Add devmapper_test.go
...
Upstream-commit: 4bebca848ea3546cd5813ab4c13b0248050454d8
Component: engine
2013-11-13 15:35:52 -08:00
Michael Crosby
dd83a25360
Add test coverage for devicemapper driver.go
...
Upstream-commit: 6b3dd02bb8068fd9f1d35e75db95d0650a1d3123
Component: engine
2013-11-13 14:56:26 -08:00
Michael Crosby
1b8dd1a73f
Make sure setInitialized is called when device is mounted
...
Upstream-commit: 80e73195583c5a9bf02c58ba92832a0bb2819361
Component: engine
2013-11-13 14:54:47 -08:00
Guillaume J. Charmes
3a53e72829
Create devmapper_wrapper.go
...
Upstream-commit: 1d188c8737f97a4882851ccd0150cd09c7f6c1e9
Component: engine
2013-11-13 14:36:31 -08:00
Andy Rothfusz
de14ff2222
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
Upstream-commit: 3cf23b93eaf0b51983204bb28182eb39c0791559
Component: engine
2013-11-13 13:35:01 -08:00
Guillaume J. Charmes
048409a651
Merge pull request #2676 from tianon/go1.2rc4
...
Update to go1.2rc4
Upstream-commit: 3ba6835ead266a9f365b897ca29db8de2278e994
Component: engine
2013-11-13 11:45:56 -08:00
Guillaume J. Charmes
240d1e68ec
Merge pull request #2686 from shykes/gofmt
...
gofmt
Upstream-commit: dc13b9473f19dec441f02de8aa79ca61b5d8b2ee
Component: engine
2013-11-13 11:35:37 -08:00
Solomon Hykes
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
Andy Rothfusz
8a1c75284e
Merge pull request #2660 from SvenDowideit/2601-remote-api-json-case
...
update the API docs to reflect the change in the case of the /index/search reposnse
Upstream-commit: 8e71391572adeaa6e5d0f980e71168ba8ef98b46
Component: engine
2013-11-13 11:17:54 -08:00
Michael Crosby
19f53e14f1
Add test for ApplyDiff
...
Upstream-commit: a69d86e0b19d804819d37a2a9edc03803267f579
Component: engine
2013-11-13 11:03:56 -08:00
Andy Rothfusz
cbc18a2e03
Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations
...
add a little more info about the limitations of ADD wrt ../ and docker build
Upstream-commit: 077c2496ed39b6682924b1da9d388e5a21453310
Component: engine
2013-11-13 10:56:35 -08:00
Guillaume J. Charmes
60ef46d821
Merge pull request #15 from alexlarsson/dm-plugin-explicit-init
...
Remove devicemapper lazy initialization
Upstream-commit: 46ab7d1e8a4256a39ee700ae217fedca20bc1ccf
Component: engine
2013-11-13 10:46:24 -08:00
Tianon Gravi
6b9d5c5bd5
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Upstream-commit: b94e9ed0de0817d07ad590e5d32262016f25e6e8
Component: engine
2013-11-13 10:42:41 -08:00
Guillaume J. Charmes
32f37aa122
Merge pull request #23 from crosbymichael/ignore-dir-sizes
...
Ignore dir sizes in TreeSize func
Upstream-commit: e3597624dd7b818234da50993a5b2597d11ebc5a
Component: engine
2013-11-13 10:40:03 -08:00
Ryan Seto
01395ce3bb
Add more depth to the upstart example in host_integration.rst
...
I found that the original example wasn't starting the docker container when docker is started. So, I modified it using information I found from https://groups.google.com/forum/#!msg/docker-user/OWz8EOpiXuo/L_uxGFQuYlkJ
Also, upstart wasn't starting docker if it wasn't running ahead of time. So, I added a change to the docker upstart script to solve this.
Upstream-commit: 02884ee42971be141edde8964d72a2d2c7f63cfe
Component: engine
2013-11-13 13:34:34 -05:00
Michael Crosby
2e972c6b88
Ignore dir sizes in TreeSize func
...
Upstream-commit: a4f14528c25c4a092c30334d05008fe44275a79e
Component: engine
2013-11-13 10:33:24 -08:00
Jérôme Petazzoni
a905d364a8
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
...
Upstream-commit: 8145e57cee6390bb27d7fb07fe5f572affe5d0cd
Component: engine
2013-11-13 10:29:29 -08:00
Solomon Hykes
95762ca3a4
Merge pull request #2673 from shykes/engine-patch-2
...
* Engine: expand the engine API with 'create' and 'start' jobs Edit
Upstream-commit: c964494d315ea672e2a4987cbfd9c9e8852553b8
Component: engine
2013-11-13 10:14:56 -08:00
Solomon Hykes
2a405d59e4
Merge pull request #2656 from shykes/export-restrictions-debian
...
Change crypto export notice to meet Debian requirements
Upstream-commit: c6e83b8779f6792163548f216f6402f691e3ee61
Component: engine
2013-11-13 09:37:23 -08:00
Guillaume J. Charmes
0f9abe6bf6
Merge pull request #2680 from inglesp/patch-1
...
Typo in ROADMAP.md
Upstream-commit: 369e39aea1b87dc85b829937bea2f7c48436ba99
Component: engine
2013-11-13 09:19:37 -08:00
¨Sven
59d38006c9
add a little more info about the limitations of ADD wrt ../ and docker build -
...
Upstream-commit: af0b2e38c3b2688cd4c2e831847bf4601d8fc149
Component: engine
2013-11-13 22:55:55 +10:00
inglesp
6d93aad6a7
Typo in ROADMAP.md
...
Upstream-commit: 87b4bb9fcc41806da4ed3151e74511120c099115
Component: engine
2013-11-13 12:32:49 +00:00
Freek Kalter
172689d6bb
fix error in python webapp example
...
When getting the private port used by a container using
`docker port` returns 0.0.0.0:49353, stript just the portnumber of the address with awk to used it in the rest of the example code.
Upstream-commit: f5e6c2d060d5eb052929c4ab14bf3256b260afc4
Component: engine
2013-11-13 13:20:38 +01:00
¨Sven
b5a0f0ad5b
update the v1.7 API to reflect the case change in the /index/search response, and note that its to align better with the registry server response that its proxying
...
Upstream-commit: f0f8462d18cf2efc44ee48cfdd2706e8a4a800d6
Component: engine
2013-11-13 22:11:20 +10:00
Xiuming Chen
d85082acd3
Minor code simplification for Containers api
...
Upstream-commit: 0013aa7d9f74eab1c6d02cf9f7b35a1b9364b17a
Component: engine
2013-11-13 01:29:00 -08:00
Liang-Chi Hsieh
d033d0366c
use Binds key in hostConfig to detect volumes mounted from external.
...
Upstream-commit: 1d7f22c0d4bb55cf797b303cc46b1944509e4085
Component: engine
2013-11-13 15:08:46 +08:00
Liang-Chi Hsieh
9f0beed503
skip the volumes mounted when deleting the volumes of container.
...
Upstream-commit: 6a693176d6b2dbf4afd36ebda2aeb9495fdf42bc
Component: engine
2013-11-13 14:58:24 +08:00
Tianon Gravi
c52a89950a
Update to go1.2rc4
...
Upstream-commit: 8523d5518c500903c19a53f73c653318e4db38f9
Component: engine
2013-11-12 21:51:12 -07:00
Solomon Hykes
a48718c85a
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
Solomon Hykes
cd79a08f60
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
Upstream-commit: 3885ef585bf132a04e174f32e6bb7e86d7730c32
Component: engine
2013-11-12 15:04:26 -08:00
Victor Vieux
5c6b4b612c
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
Upstream-commit: 388057f11a20fd8b4bfd7d1b0d9f0cb18a72afa8
Component: engine
2013-11-12 14:40:17 -08:00
Michael Crosby
4f1e360778
Merge pull request #22 from shykes/shykes-0.6.5-dm-plugin
...
Fix ImageTree test
Upstream-commit: a06edd77e5e6e8de1fd1e745bc462af6cbd11001
Component: engine
2013-11-12 12:30:30 -08:00
Guillaume J. Charmes
071e45dc12
Merge pull request #2663 from viirya/fix_nameserver_regex
...
Fix nameserver regex
Upstream-commit: c69e6a90e49d27916a8294044510b968206ab4a2
Component: engine
2013-11-12 12:29:40 -08:00
Guillaume J. Charmes
ce008ff5b0
Fix ImageTree test
...
Upstream-commit: 08623dc216227d6377cb4558caedd75cacf68755
Component: engine
2013-11-12 12:25:35 -08:00