docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
4,365 Commits 12 Branches 297 Tags
e63f1ff2a2968bbe6f873edd45282eb709c168ce
Commit Graph

4365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
e63f1ff2a2 Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin 
Merge from dotcloud/docker master 
Upstream-commit: eb06a7b8f87e14891b38f650e13e23760cf7a051
Component: engine
 2013-11-14 14:14:13 -08:00
Guillaume J. Charmes
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
 2013-11-14 14:02:44 -08:00
Michael Crosby
5f7a312280 Merge branch 'dm-plugin-new-ChangesDirs' of https://github.com/alexlarsson/docker into alexlarsson-dm-plugin-new-ChangesDirs 
Conflicts:
	archive/changes.go
Upstream-commit: eace2dbe1d49ad6a990f5b42f092d3f4d77bf225
Component: engine
 2013-11-14 12:23:01 -08:00
Michael Crosby
bf15883f56 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm 
Fix lxc start for shared root filesystems 
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
 2013-11-14 11:20:53 -08:00
Andy Rothfusz
43fe95ed51 Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations 
except URL-based ADDs
Upstream-commit: c7aaf831d7ae6ddd0a897c6f687d479904536107
Component: engine
 2013-11-14 11:12:08 -08:00
Solomon Hykes
1ac8c4289f Merge pull request #29 from crosbymichael/try-load-aufs 
Try to load aufs first then check in filesystems for aufs support
Upstream-commit: 099c53b28ef361c236b0c2b22dbf6a43bb647af2
Component: engine
 2013-11-14 10:11:19 -08:00
Michael Crosby
93ce091ee1 Try to load aufs first then check in filesystems for aufs support 
Upstream-commit: 7b2d59b91e64e72e346747cf2e561be8afc87fa7
Component: engine
 2013-11-14 09:42:12 -08:00
Guillaume J. Charmes
ce293b5a8b Merge pull request #28 from crosbymichael/close-sparse-files 
Close sparse files when done
Upstream-commit: 529c30261efeede3a101fc62a0f72cbf992b3b02
Component: engine
 2013-11-14 07:02:47 -08:00
¨Sven
7b5ae8dd36 thankyou @tomdz - I forgot about URL based ADDs 
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
 2013-11-14 14:53:55 +10:00
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
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
Michael Crosby
2e972c6b88 Ignore dir sizes in TreeSize func 
Upstream-commit: a4f14528c25c4a092c30334d05008fe44275a79e
Component: engine
 2013-11-13 10:33:24 -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
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
Guillaume J. Charmes
88636cc70a Merge pull request #17 from alexlarsson/dm-plugin-whiteout-directory 
archive.ApplyLayer() - handle directory whiteouts
Upstream-commit: 50d80a89381366001d2e888b822a139cd8eb2025
Component: engine
 2013-11-12 12:16:30 -08:00