1
0
mirror of https://github.com/docker/cli.git synced 2026-01-29 18:02:11 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Guillaume J. Charmes
002d37a1c9 Fix #108, reattach now works properly
Upstream-commit: 0b2eee8b33448c27c4d2b29b995a56ce3a411963
Component: engine
2013-03-29 09:31:47 -07:00
Solomon Hykes
3f6c2c9af6 Merge pull request #265 from dotcloud/formating_debug_harmonize
Formating debug harmonize
Upstream-commit: d0d5d5ff094a5c03a6b13a18394108cda126eef2
Component: engine
2013-03-29 21:30:43 -07:00
Solomon Hykes
c78aa90b5a Merge pull request #266 from dotcloud/do_not_log_stopped_container
Do not log non-running containers
Upstream-commit: 57dfca052b47ae6daf6d0c54e68907a025f9ec8e
Component: engine
2013-03-29 21:29:19 -07:00
Solomon Hykes
38462f5f51 Add comments in graph.go
Upstream-commit: 99b36c2c326ccc11e726eee6ee78a0baf166ef96
Component: engine
2013-03-29 21:13:59 -07:00
Solomon Hykes
6a1fd378c7 Merge remote-tracking branch 'origin/264-remove_cmdAttach_option'
Upstream-commit: b013d937869372a352387d3441f1c36428f958c3
Component: engine
2013-03-29 20:30:43 -07:00
Solomon Hykes
57259fb9c3 Merge remote-tracking branch 'lopter/master'
Upstream-commit: b1fa21aa0ee9326ad6e3c0f32b80f5905995427a
Component: engine
2013-03-29 20:17:33 -07:00
Louis Opter
69a838f359 Fix output in the login command
It was broken because the terminal is in raw mode.

This changeset adds code in the login commmand to do a little bit of
interpretation on the user input (something usually done by the terminal
emulator itself).
Upstream-commit: 9740102990b059d014fad5f8652306cf7ff62d94
Component: engine
2013-03-29 11:39:41 -07:00
Guillaume J. Charmes
0ccd58f712 Do not log non-running containers
Upstream-commit: 0f7a4534c16cda07344a7231d6012268f4aa53aa
Component: engine
2013-03-29 08:46:06 -07:00
Guillaume J. Charmes
38f2e38ea3 Remove unused variable from container struct
Upstream-commit: 7a565a0479b6a797a0cdc9a4156e57ce811032b3
Component: engine
2013-03-29 08:41:48 -07:00
Guillaume J. Charmes
a659bdb4eb Add some error checking in container monitor
Upstream-commit: 69c2250ec2fd23dc9d31372cb433b7c18a917d09
Component: engine
2013-03-29 08:29:59 -07:00
Guillaume J. Charmes
2588801f2a Harmonize the error management. Use fmt.Errorf instead of errors.New
Upstream-commit: d17f78c373d5d8cd015626c7972e0e2365eab2a7
Component: engine
2013-03-29 08:19:42 -07:00
Guillaume J. Charmes
f235c36167 Add debug infos
Upstream-commit: ccac5b138253ab87846089cb5af9b4b77a7fd9d5
Component: engine
2013-03-29 08:18:43 -07:00
Guillaume J. Charmes
c96ec675c0 Remove the options of CmdAttach
Upstream-commit: 9442d6b349295818d9a0ddecc10ca19019ead935
Component: engine
2013-03-29 07:49:26 -07:00
Guillaume J. Charmes
84436a6982 Improve the containers unit tests (add error checking)
Upstream-commit: 232dbb186416df290fc698e92b3a120b92497559
Component: engine
2013-03-29 07:44:58 -07:00
Robert Obryk
ddfd49ddce Fix a deadlock in CmdStream.
As per FIXME, CmdStream could have deadlocked if a command printed
enough on stderr. This commit fixes that, but still keeps all of
the stderr output in memory.
Upstream-commit: 58befe3081726ef74ea09198cd9488fb42c51f51
Component: engine
2013-03-29 12:55:48 +01:00
John Costa
3b20ce08e1 remove dulicated text and correct contributing link
Upstream-commit: bd3c6793a183b9b848e34312a0215cb9078f2240
Component: engine
2013-03-29 07:06:58 -04:00
Robert Obryk
2db6acd48b Fix a race condition in bufReader.
The race condition cen be detected by running existing bufReader tests
with Go's race detector.
Upstream-commit: d52451bcf887790df5a6a7cbbc7305747535eb11
Component: engine
2013-03-29 11:00:50 +01:00
Maxim Treskin
2c32113c8a Remove unnecessary part of paths to lxc executables
Upstream-commit: 6d72758f1268f710be635cb16ef8e001fc6516a5
Component: engine
2013-03-29 12:07:25 +07:00
Solomon Hykes
84af23bd19 Fixed leftover from docs merge. Thanks @cespare for spotting!
Upstream-commit: 1d6929c8bc6cbc5ad63dce083869460b6bb377ad
Component: engine
2013-03-28 19:18:03 -07:00
Solomon Hykes
8ff79b2c0d Merging dhrp/docs
Upstream-commit: 48a208baf197c035c59ecd44d285fb3640107233
Component: engine
2013-03-28 19:12:58 -07:00
Thatcher Peskens
1a47c25086 Fixed some links in gettingstarted
Upstream-commit: 61cf09b2e7491295575195b616207059e7107f01
Component: engine
2013-03-28 19:03:06 -07:00
Solomon Hykes
ce39132944 Merge pull request #241 from titanous/cleanup-deps
Remove unneeded sqlite deps from puppet and debian control
Upstream-commit: b51fe837a4992437372e18f9660c87be9ee593a8
Component: engine
2013-03-28 18:45:44 -07:00
Solomon Hykes
ea281519af Merge pull request #244 from dotcloud/docs-julien
Docs: Changed the url of the LEGO img to point to the one with copyright
Upstream-commit: 4e11e425467f1aac77104cc983df160b45e3da41
Component: engine
2013-03-28 18:45:20 -07:00
Solomon Hykes
7f80c9c88f Test that iptables() looks for iptables in the PATH
Upstream-commit: ba33d67a1a0f3310bddab8176a9d570e5d5c00e2
Component: engine
2013-03-28 18:44:47 -07:00
Solomon Hykes
5d8e5c0e3c Merge remote-tracking branch 'shawnsi/iptables-wrapper'
Upstream-commit: 70853785b6f04337168343d8889eba413a40ce54
Component: engine
2013-03-28 18:40:02 -07:00
Solomon Hykes
a2ceb7616d Merge remote-tracking branch 'titanous/camelize'
Upstream-commit: 12a65dc4a884977454e7924db4a87166f751536a
Component: engine
2013-03-28 18:23:59 -07:00
Solomon Hykes
8e4fe953ce Merge pull request #246 from titanous/update-authors
Update AUTHORS and add .mailmap
Upstream-commit: b67fe1ecb92924a4f059448014fac6b6f24accc8
Component: engine
2013-03-28 18:19:05 -07:00
Jonathan Rudenberg
c6d2fd3579 Update AUTHORS and add .mailmap
Upstream-commit: 6bcc55f7d030d0cfd7bf130070805a9001951b06
Component: engine
2013-03-28 20:53:54 -04:00
Jonathan Rudenberg
3e91a54abc Camelize some snake_case variable names
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
Julien Barbier
e2569478ab Docs: Changed the url of the LEGO img to point to the one with copyright
Upstream-commit: d66de319bd1c66e04421c19e7fc25b825d94fe00
Component: engine
2013-03-28 17:09:36 -07:00
John Costa
4950bad777 add contributing guidlines md file
Upstream-commit: 760736b3f3f289c2dba013aaef385b1e7b555feb
Component: engine
2013-03-28 20:04:21 -04:00
Solomon Hykes
264201cac6 Merge remote-tracking branch 'origin/165-push_permission_check-fix'
Upstream-commit: 0636c11f0b15f8fa0693be2d3560370f19f773cf
Component: engine
2013-03-28 15:45:00 -07:00
Jonathan Rudenberg
4b29aba42a Remove unneeded sqlite deps from puppet and debian control
Upstream-commit: 5dc1e66366d3a40169eec67d823f2d6209ba5b99
Component: engine
2013-03-28 18:38:53 -04:00
John Costa
8ff2f8602f move documentation changes to reStructuredText docs under website. https://github.com/dotcloud/docker/issues/42
Upstream-commit: a5054184a172da0b9abd2470946bb15ab5fb0516
Component: engine
2013-03-28 16:32:31 -04:00
Thatcher Peskens
52aecd4a56 Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
Conflicts:
	docs/sources/examples/python_web_app.rst
Upstream-commit: 09910785c80822fad71127db4ec30b3de8c27f08
Component: engine
2013-03-28 12:48:32 -07:00
Shawn Siefkas
46acd15bd1 Handling iptables() errors more usefully during portmapper setup
Upstream-commit: 523803d633e3bf7e4076ad41e73daba491da5d40
Component: engine
2013-03-28 14:44:54 -05:00
Thatcher Peskens
390b8a98e6 Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
Upstream-commit: 4bd21e0d7f2d300dfa2ac6532260032a9c37e38a
Component: engine
2013-03-28 12:36:14 -07:00
Shawn Siefkas
de000293fa Return error when iptables is not found
Upstream-commit: c66d2b6a532c657b554ffa3c80b2cf15e218ee8e
Component: engine
2013-03-28 14:30:56 -05:00
Thatcher Peskens
a587e006db Added the lego illustration to the docs.docker.io 'homepage'
Upstream-commit: da69df5f421ed49464254fb52dc222f98587345f
Component: engine
2013-03-28 12:27:37 -07:00
Thatcher Peskens
b0c9bfcaf7 Changed the lego illustration on /README.md to the version which contains the copyright in the image itself.
Upstream-commit: 32b58159cd0eedc9d6cd05e8d78b8519c5b690c7
Component: engine
2013-03-28 12:18:22 -07:00
Shawn Siefkas
ef4aab72d7 Looking for iptables in PATH
Upstream-commit: dfc3904f778996a449ef5199e36fce6cabfb803a
Component: engine
2013-03-28 14:02:50 -05:00
Solomon Hykes
7627c4db8d Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 4825d3a5374cb177642c72389d6048f34535d9c9
Component: engine
2013-03-28 11:54:33 -07:00
Ken Cochrane
746cb02751 fixed some of the syntax in example
The example was broken, I updated it to work with latest version of code.
Upstream-commit: 5c639118d35c1c2048123e94fd4b9ff9b98c89dc
Component: engine
2013-03-28 15:51:10 -03:00
Thatcher Peskens
4f5f536f6e Removed $'s from examples to make them easier to copy paste
Upstream-commit: 9bc7e71f16365f21c1b54ad1c16188eda668296e
Component: engine
2013-03-28 11:50:00 -07:00
Solomon Hykes
81ccb33fbc Merge remote-tracking branch 'origin/174-remove_image_twice-fix'
Upstream-commit: 19316955dd33eefc7f77f3c6b6591b47ba0cab82
Component: engine
2013-03-28 11:48:41 -07:00
Thatcher Peskens
934886e0bd Fixed links on gettingstarted to point to the right places in docs
Upstream-commit: 172f746e4d80df0efd2b30ba6be540d7ec423db3
Component: engine
2013-03-28 11:44:33 -07:00
Solomon Hykes
9de6b5992b Merge remote-tracking branch 'origin/docs'
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
2013-03-28 11:12:00 -07:00
Thatcher Peskens
abc96f58d2 Merge remote-tracking branch 'dotcloud/master' into local/dotcloud/docs
Upstream-commit: 70594bdd166e41ffb26913749e83ba752f851ebd
Component: engine
2013-03-28 10:58:01 -07:00
Ken Cochrane
7116449be0 Merge pull request #225 from dhrp/readthedocs
#225 Update the docs to work with http://docs.docker.io
Upstream-commit: 09e69e45a676a892f97d7dd36c5320261804e751
Component: engine
2013-03-28 06:58:21 -07:00
Ken Cochrane
ab309d6f77 Merge pull request #229 from mynamewastaken/master
Fixed typo in description
Upstream-commit: 9528b8685f0a67bd52f2c4af59fdd01b93581727
Component: engine
2013-03-28 06:55:40 -07:00