toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,800 Commits 3 Branches 295 Tags
4ac27c53b9170bc25b95aeb6d053b9d0f716f7a9
Commit Graph
2800 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Liu 4ac27c53b9 Add test case for Graph ByParent(). 
Upstream-commit: 02b8d14bdd1837aad5b8fb667d1f4e7eace59687
Component: engine
 2013-08-11 01:24:21 -07:00
Brandon Liu c53567b672 Fix Graph ByParent() to generate list of child images per parent image. 
Upstream-commit: 025c759e443cc4eb43fc20b1f7da5520956b3b30
Component: engine
 2013-08-11 00:37:16 -07:00
Michael Crosby 871898eda4 Merge pull request #1483 from titanous/update-authors 
Update AUTHORS
Upstream-commit: 940d58806c3e3d4409a7eee4859335e98139d09f
Component: engine
 2013-08-10 21:16:34 -07:00
Daniel Mizyrycki fe6378861a Merge pull request #1489 from dotcloud/1422-revert-upstart 
Revert "docker.upstart: avoid spawning a `sh` process"
Upstream-commit: cd9886f0a873e2d5bfb0fe058b34e442a304bc3b
Component: engine
 2013-08-10 11:07:21 -07:00
Michael Crosby ee79dd7602 Revert "docker.upstart: avoid spawning a sh process" 
This reverts commit 24dd50490a027f01ea086eb90663d53348fa770e.
Upstream-commit: e3acbff2edd04c8a7211ea078b24745749021efc
Component: engine
 2013-08-10 03:06:08 +00:00
Michael Crosby 85d9c3236a Merge pull request #1484 from titanous/use-range 
Use ranged for loop on channels
Upstream-commit: 3e12349831903a11c67a9ca40a0d566e428aa876
Component: engine
 2013-08-09 18:06:12 -07:00
Jonathan Rudenberg 66d2ddf8c5 Use ranged for loop on channels 
Upstream-commit: 7c50221de5ec1066f0f04d6db94ee9c2fef98efb
Component: engine
 2013-08-09 20:42:20 -04:00
Michael Crosby 51ecc0b473 Merge pull request #1481 from titanous/fix-sprint 
Fix typo: fmt.Sprint -> fmt.Sprintf
Upstream-commit: 3d63087f78ff2ace86d5ea0331e32418914438b8
Component: engine
 2013-08-09 17:28:59 -07:00
Jonathan Rudenberg 99c7db4cc9 Update AUTHORS 
Upstream-commit: 1408f08c40f73ccf0204334ceb44ac482c5641e9
Component: engine
 2013-08-09 20:09:42 -04:00
Jonathan Rudenberg 204241346e Fix typo: fmt.Sprint -> fmt.Sprintf 
Upstream-commit: 3b23f02229fd3f4928934f317d41b8f497cec9a9
Component: engine
 2013-08-09 19:52:05 -04:00
Guillaume J. Charmes dd00bdcd04 Merge pull request #1479 from jpetazzo/fix-testbindmounts-typo 
- Tests: fix typo in TestBindMounts (runContainer called without image)
Upstream-commit: fd5099c9fec49004f19d5a1200d0debfb9a365a7
Component: engine
 2013-08-09 16:20:24 -07:00
Jérôme Petazzoni ca934a037f fix typo in TestBindMounts (runContainer called without image) 
Upstream-commit: 68b09cbe3d0a13bd1dbcaa39a63788fe938d0ae7
Component: engine
 2013-08-09 16:03:05 -07:00
Guillaume J. Charmes cf78c6ec1e Merge pull request #1146 from benoitc/feature/attach_ws 
* Runtime: add websocket support to /container/<name>/attach/ws
Upstream-commit: 92cd2f5badd402e0f9738114004f0223a92f6016
Component: engine
 2013-08-09 15:38:24 -07:00
Guillaume J. Charmes 42fa1cc5fa Merge pull request #1460 from dotcloud/patch1 
* Runtime: Mount /dev/shm as a tmpfs
Upstream-commit: 8d1cd63dfa7fddba5d4b290b1d2b59d3cd1dca48
Component: engine
 2013-08-09 15:18:22 -07:00
Michael Crosby 0c080883ce Merge pull request #1477 from kevinclark/builder-fixme 
Only count known instructions as build steps
Upstream-commit: 2c4c10fb4ab6bb114ae0bf5ee46f41c2cf561d7c
Component: engine
 2013-08-09 14:45:06 -07:00
Kevin Clark 335d59ebfb Add myself to AUTHORS 
Upstream-commit: 722d4e916a727716f7f7b330c8fbea4bc089d62f
Component: engine
 2013-08-09 14:39:03 -07:00
Kevin Clark 4b414aab13 Only count known instructions as build steps 
stepN is only used in the log line, so if we only produce the log line
when there's a message, it should do the right thing.

If it's *not* a valid instruction, it gets a line as well, so there's no
reason to double up.
Upstream-commit: 4ff649a4eaf5c653176d2fecbfdb6571f0d0d174
Component: engine
 2013-08-09 14:38:29 -07:00
Michael Crosby 9ba4f54ab7 Merge pull request #1462 from dotcloud/fix_build_events_output 
Fix docker build and docker events output
Upstream-commit: 25e7227c81a6010f326c4f65e4cf566223bc41b0
Component: engine
 2013-08-09 12:41:18 -07:00
Jérôme Petazzoni d8a5c45eaa Merge pull request #1463 from jpetazzo/https-get-docker-io 
switch from http to https for get.docker.io
Upstream-commit: 04cd0a392bcadf36356047fd722ba1ce6cacce5f
Component: engine
 2013-08-09 11:26:56 -07:00
Guillaume J. Charmes b46f1ca6a3 Merge pull request #1452 from dotcloud/improve_TestGetContainersTop 
* Tests: Improve TestGetContainersTop so it does not rely on sleep
Upstream-commit: 55f9610cde8f4232a2f7bf84298cb1f5c27137ba
Component: engine
 2013-08-09 10:28:34 -07:00
shin- 26131c8056 brew: added safeguards in script and changed default branch to 'master' 
Upstream-commit: 6178dc7f1be0d3c90ed02e8ccbafa4d7e103508d
Component: engine
 2013-08-09 16:40:28 +02:00
Solomon Hykes e19a396471 Merged 0.5.2 hotfix release back to master 
Upstream-commit: b8f8f9d07e7142b56ddcb05d1b8c8322d1114436
Component: engine
 2013-08-08 19:45:57 -07:00
Michael Crosby 99970249be Merge pull request #1464 from dotcloud/bump_0.5.2 
Bump to 0.5.2
Upstream-commit: 1643943402fdbce021db51b0f4f49edb0fa2e285
Component: engine
 2013-08-08 17:36:53 -07:00
Michael Crosby c3b5f3b391 Bump to v0.5.2 
Upstream-commit: e99a99eb6ee7257c0b11312bec33fe27cffdaaaa
Component: engine
 2013-08-09 00:17:35 +00:00
Michael Crosby d9f7dc6f82 Change daemon to listen on unix socket by default 
Conflicts:
	docs/sources/api/docker_remote_api.rst
Upstream-commit: df9712f1c8039f83497e3c647788dd697f034158
Component: engine
 2013-08-09 00:16:43 +00:00
Michael Crosby c297029200 Merge pull request #1417 from crosbymichael/root-socket 
Change daemon to listen on unix socket by default
Upstream-commit: 28d38620f03d3db969f7e63655728b21180b26e9
Component: engine
 2013-08-08 17:06:49 -07:00
Jérôme Petazzoni ddd4394f37 switch from http to https 
Upstream-commit: 1ce9b3ca9c2ca2b2060e39a217d2e496c9a31826
Component: engine
 2013-08-08 17:02:59 -07:00
Jérôme Petazzoni ee3c1a6db9 change network range to avoid conflict with EC2 DNS 
Upstream-commit: 5c56b597a9f6d910ee1f22da42f8b9e5d18c678a
Component: engine
 2013-08-08 23:27:55 +00:00
Michael Crosby f68b60ff71 Forbid certain paths within docker build ADD 
Conflicts:
	buildfile_test.go
Upstream-commit: f712e10cb21d0056593ea23152d347637396c810
Component: engine
 2013-08-08 23:22:14 +00:00
Victor Vieux 232667a23e fix docker build and docker events output 
Upstream-commit: 213365c2d27734bfbeeb1fc102fded7625550982
Component: engine
 2013-08-08 22:51:39 +00:00
Sam Alba eadd4725b0 Merge pull request #1361 from dotcloud/library 
Docker-brew and Docker standard library
Upstream-commit: 7f02bd3b7a814c6db77744ef668d4bbf9cc43946
Component: engine
 2013-08-08 14:22:20 -07:00
Guillaume J. Charmes 1ea26ff1ae Improve TestGetContainersTop so it does not rely on sleep 
Upstream-commit: ceb33818cdce434281889b75c278e43b85aec647
Component: engine
 2013-08-08 11:51:31 -07:00
Guillaume J. Charmes 02b34c43f3 Make sure all needed mountpoint are present 
Upstream-commit: 18fc707fdf06aeb50fa5250f59f0ef4597d7cf73
Component: engine
 2013-08-08 11:25:02 -07:00
Michael Crosby ec7d64308d Merge pull request #1216 from dotcloud/add_some_tests 
Add some tests in server and utils
Upstream-commit: c3027fa9ace7f607929af544dc1f59916f76f533
Component: engine
 2013-08-08 09:57:18 -07:00
Victor Vieux 4f3f508ac7 rebase 
Upstream-commit: 4249867e5bf01657b22be78141fa933ea6a036f0
Component: engine
 2013-08-08 14:58:52 +00:00
Victor Vieux cf9140c17a rebase master 
Upstream-commit: c804a5f827f31c5300f34ec4614a5067a0c17456
Component: engine
 2013-08-08 14:56:37 +00:00
Victor Vieux 800fcaba4c Merge branch 'master' into add_some_tests 
Upstream-commit: be77ee33bca2399b4eb6749253b9c3ab18915783
Component: engine
 2013-08-08 14:44:56 +00:00
Victor Vieux 440cdd2c06 Merge pull request #1456 from dotcloud/1455-force_commit_build_env 
Make sure ENV instruction within build perform a commit each time
Upstream-commit: 5928ed5d45a393fbd627b3c06eca56eeabca7504
Component: engine
 2013-08-08 07:37:51 -07:00
Karan Lyons 5bd6559b07 Mount /dev/shm as a tmpfs 
Fixes #1122.
Upstream-commit: 075d30dbced0e00843153a6975daa1291e90b339
Component: engine
 2013-08-07 17:44:33 -07:00
Guillaume J. Charmes c2560e21bf Make sure ENV instruction within build perform a commit each time 
Upstream-commit: 6a6a2ad8a4af85b543a24c5d22a2be5fdfc252d6
Component: engine
 2013-08-07 17:23:49 -07:00
Guillaume J. Charmes 2f4a7982a7 Merge pull request #1420 from jpetazzo/fix-get-docker-io-upstart-script 
* Packaging: Fix the upstart script generated by get.docker.io
Upstream-commit: 279fe144e180725b8468d8210a84a294290d1439
Component: engine
 2013-08-07 17:13:54 -07:00
Daniel Mizyrycki 500bb791ba Merge pull request #1423 from krautcomputing/fix_indentation_in_vagrantfile 
Fix indentation in Vagrantfile
Upstream-commit: cc80bd41c43da818e464a35e572fa456fd4a8796
Component: engine
 2013-08-07 17:10:40 -07:00
Andy Rothfusz d9ad2761a9 Merge pull request #1447 from kermit666/image-tag-doc 
doc: syntax to run a specific image tag
Upstream-commit: 06183e6cdc8c2b7cef456eaf1ac1d904b57a9650
Component: engine
 2013-08-07 16:23:45 -07:00
Guillaume J. Charmes 490527a43f Merge pull request #1425 from dotcloud/simplify_ProgressReader 
- Runtime: fix small \n error un docker build
Upstream-commit: 6249cc3373ccc18ae154a8861bb98e772639c0ce
Component: engine
 2013-08-07 16:19:42 -07:00
Solomon Hykes 33828cfbb1 Merge pull request #1451 from dotcloud/michael-maintainer 
Add Michael Crosby to core maintainers
Upstream-commit: 80f34c6aebc988884c3bb137794e1f488aabab0c
Component: engine
 2013-08-07 15:53:29 -07:00
Guillaume J. Charmes 228a0e9732 Merge pull request #1435 from jpetazzo/userland-proxy-should-listen-on-inaddr-any 
* Runtime: Let userland proxy handle container-bound traffic
Upstream-commit: a2f526dadc71e4f7b6aa8d8bbbd0594d24146a78
Component: engine
 2013-08-07 15:48:17 -07:00
Guillaume J. Charmes 84dfd730ab Merge pull request #1445 from dsissitka/host 
* Runtime: Updated the Docker CLI to specify a value for the "Host" header.
Upstream-commit: 429d2f85cb23332a59d42c096bba0e227d2f5663
Component: engine
 2013-08-07 15:38:50 -07:00
Guillaume J. Charmes 1aeb7ad567 Merge pull request #1395 from c00w/490-warn-ipv4forwarding-disabled 
* Runtime: Add warning when net.ipv4.ip_forwarding = 0
Upstream-commit: 2ca018b2ebc2ba95e7b0812053f7bccbe73a6463
Component: engine
 2013-08-07 15:31:12 -07:00
Guillaume J. Charmes 26c9729379 Merge pull request #1362 from dotcloud/registry_test 
* Registry: Registry unit tests + mock registry
Upstream-commit: 3e6e08ce00eb7e90a5302683b71d6aaf826083ca
Component: engine
 2013-08-07 15:30:07 -07:00
Colin Rice c75bcf8bab Fix reversed IPv4Forwarding check in api.go 
Upstream-commit: 3e491f8698860ed92b9f4cd6790eda82e083ae1e
Component: engine
 2013-08-07 18:28:40 -04:00