1
0
mirror of https://github.com/docker/cli.git synced 2026-01-28 04:20:55 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Andy Rothfusz
85e46e1ff2 Merge pull request #709 from dhrp/links-to-kernel-doc
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
Upstream-commit: 235ae9cd43bbdaba9ea75ecbff8cf2f902e70cb9
Component: engine
2013-05-28 12:07:46 -07:00
meejah
ca4176193b Add sudo to commands.
Upstream-commit: 444f7020cbc639fd781744be207c843aaf663077
Component: engine
2013-05-28 10:56:26 -06:00
meejah
d4815bdeb7 Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you.
Upstream-commit: 525080100d2e2a7899c9a51a1ca57e28e32e8488
Component: engine
2013-05-28 10:54:32 -06:00
Victor Vieux
b292d69f2b return 404 on no such containers in /attach
Upstream-commit: e5fa4a4956393afc473539710e2a4b7297eb6ebf
Component: engine
2013-05-28 16:19:12 +00:00
Victor Vieux
a20c31a039 rename containers/ps to containers/json
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
Victor Vieux
663bde65c3 documentation
Upstream-commit: 8699805756d25602e2412173aac7364fbe9627c7
Component: engine
2013-05-28 15:49:57 +00:00
Victor Vieux
c51ff0dbbf invert status created
Upstream-commit: d9670f427522fc847313ad1b94b1e288dafe7690
Component: engine
2013-05-28 15:06:26 +00:00
Ken Cochrane
f59c80762b Merge pull request #729 from mmcgrana/fix-attach-api-docs
- Documentation: Fix attach API docs typo.
Upstream-commit: 3d8da806111829170532cbdea6ab06002a7400fa
Component: engine
2013-05-28 06:53:41 -07:00
Mark McGranaghan
9a8934c1af Fix attach API docs.
Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc
Component: engine
2013-05-28 06:27:12 -07:00
Victor Vieux
3d5929f437 remove hijack on the client in logs, and split stdout / stderr
Upstream-commit: fbcd8503b3a29bdbb7a52d6433b0ab79877bc4ce
Component: engine
2013-05-27 16:07:05 +00:00
Victor Vieux
037b9b6160 fix json encoding, and use less casts
Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014
Component: engine
2013-05-26 23:45:45 +00:00
Victor Vieux
b088e2de70 ensure valid json
Upstream-commit: 14212930e40439d0cfc635d56e084736867f9e30
Component: engine
2013-05-25 15:51:26 +00:00
Victor Vieux
04ca200a24 imporved error, push, import insert
Upstream-commit: c8c7094b2e8088210e2182e582264e09222c6e3d
Component: engine
2013-05-25 15:09:46 +00:00
Victor Vieux
7a922259e1 add error handling
Upstream-commit: cb0bc4adc297baeea8e7b74269765c35457e04e7
Component: engine
2013-05-25 14:12:02 +00:00
unclejack
03c163a915 set architecture to x86_64 by default
We're going to hardcode architecture to amd64 for now.
This is a stub and will have to be changed to set the actual arch.
Upstream-commit: 5f69a53dba4b0e550ab29c7f2bf4277222927097
Component: engine
2013-05-25 13:03:49 +03:00
Guillaume J. Charmes
57720219a1 Merge pull request #657 from offby1/master
Minor tweaks to python_web_app.rst
Upstream-commit: d3b9733507746b29e7f3da6f69bddf95f55d9582
Component: engine
2013-05-24 19:19:32 -07:00
Solomon Hykes
fdc407078f * Registry: specified naming restrictions for usernames and repository names
Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14
Component: engine
2013-05-24 18:58:24 -07:00
Solomon Hykes
0fb224b331 Fix a unit test broken by pull request #703
Upstream-commit: bb4b35a8920bcba8b60784297650ced5b2e01e47
Component: engine
2013-05-24 18:32:21 -07:00
Solomon Hykes
2b6649e390 Added FIXME about possible race condition in a unit test
Upstream-commit: 194f48774992644257bf7cf0878e47e9834d40e1
Component: engine
2013-05-24 18:31:47 -07:00
Solomon Hykes
d6fea566f0 * Remote API: send push/pull progress bar as json
Upstream-commit: 9775f0bd145c607126ea22a17b291dea822be7b2
Component: engine
2013-05-24 17:59:27 -07:00
Guillaume J. Charmes
c6994a2dba Merge pull request #710 from dotcloud/tty_resize
+ Tty: Handle terminal size and resize in tty mode
Upstream-commit: a05bfb246f4b5efbbd2719098277c747eab03d3f
Component: engine
2013-05-24 15:12:22 -07:00
Guillaume J. Charmes
fe4868dfd9 Fix merge issue
Upstream-commit: b438565609917439cb4172717e5505c265c4e291
Component: engine
2013-05-24 14:48:13 -07:00
Guillaume J. Charmes
8e3c67a46e Merge branch 'master' into tty_resize
Conflicts:
	commands.go
Upstream-commit: ffd9e06deb9d222ac5e1f63734211c0503213e06
Component: engine
2013-05-24 14:45:31 -07:00
Guillaume J. Charmes
c479ea1a4b Finish resize implementation client and server
Upstream-commit: 88ef309a940bcbb6f85a750372b8fdbc6569c3a7
Component: engine
2013-05-24 14:44:16 -07:00
Thatcher Peskens
85e0f5a874 Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst
Upstream-commit: c5f15dcd3de02a10452963a9c56cb2e587972f58
Component: engine
2013-05-24 14:42:00 -07:00
Guillaume J. Charmes
2f5c9ae5ec Merge pull request #630 from dotcloud/check_if_logged_before_pull-fix
add login check before pull user's repo
Upstream-commit: d8e60b797fadfd1f03d518d0e9869bae4595cd6a
Component: engine
2013-05-24 12:29:59 -07:00
Guillaume J. Charmes
4366224e14 Merge pull request #689 from dotcloud/help_command-fix
- Runtime: bring Error: Command not found: <command>
Upstream-commit: 064101d82e42c0be1a5e27905ba3496b628dba55
Component: engine
2013-05-24 12:01:19 -07:00
Guillaume J. Charmes
d66839e06f Fix merge issue
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
2013-05-24 11:56:21 -07:00
Guillaume J. Charmes
db38840f84 Merge branch 'master' into help_command-fix
Conflicts:
	commands.go
Upstream-commit: 3d1bc2660c626d755582929b2e6229bfa8b625aa
Component: engine
2013-05-24 11:46:18 -07:00
unclejack
39f3a9ee0e add arch field to image struct
Upstream-commit: 2cf92abf0eff49b21812d88e74813b8848f9b758
Component: engine
2013-05-24 21:41:30 +03:00
Guillaume J. Charmes
bb12d22810 Merge branch '573-add_host_port-feature'
Upstream-commit: 48fd8ae79c4ab33cd9198a7f72c615e46fa94fbc
Component: engine
2013-05-24 11:36:05 -07:00
Guillaume J. Charmes
3ba5b8785a Merge pull request #661 from dotcloud/573-add_host_port-feature
+ Runtime: add -H flag to listen/connect to different ip/port
Upstream-commit: c167d603f2f9003a6b976f2e748549db8f56eca3
Component: engine
2013-05-24 11:32:57 -07:00
Guillaume J. Charmes
e668458c4b Simplify the Host flag parsing
Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381
Component: engine
2013-05-24 11:31:36 -07:00
Guillaume J. Charmes
68053e95b6 Gofmt
Upstream-commit: ae72c2f4d6c37a14fcd81658f6ae42d65f5c7169
Component: engine
2013-05-24 11:31:19 -07:00
Guillaume J. Charmes
0575fdb313 Fix issue within auth test
Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360
Component: engine
2013-05-24 11:31:11 -07:00
Guillaume J. Charmes
b350e4c829 Catch sigwinch client
Upstream-commit: deb9963e6e5871d53ab1d75c90bbf2da53ffcb36
Component: engine
2013-05-24 11:07:32 -07:00
Victor Vieux
2b952c89ae bump to master
Upstream-commit: d7b01c049d7f965b972603bc038922342fc67d68
Component: engine
2013-05-24 16:50:16 +00:00
Victor Vieux
1cfe074da1 use -H
Upstream-commit: 92e4a51965ce862ad1b4682a68b33550f2fd613f
Component: engine
2013-05-24 16:49:18 +00:00
Victor Vieux
10117596bb first version of Pull
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
Ken Cochrane
f24cf40e86 Merge pull request #701 from kim0/patch-1
- Documentation: Updated ubuntu install docs to avoid hardcoding kernel 3.8 version, and allow Ubuntu updates to work
Upstream-commit: 1b5ab5afe0c7ec8adf0d6c359b7a30c699a2d20b
Component: engine
2013-05-24 08:58:02 -07:00
kim0
f4c4eec030 Properly install ppa, avoid GPG key warning
Upstream-commit: 4e576f047fc8a5a75fa88a66132bdade4f3a1e44
Component: engine
2013-05-24 18:55:32 +03:00
kim0
2b0dd49ab1 Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work
Upstream-commit: 8dc2ad2c06fabb6501f0adff80761898bed5bc6f
Component: engine
2013-05-24 17:44:02 +02:00
Victor Vieux
5e71f995b8 Merge pull request #699 from dotcloud/docker_login-fix
fix docker login when same username
Upstream-commit: 58ce66e553ce0938430c01a27ed8ad32c23b1f0f
Component: engine
2013-05-24 07:32:38 -07:00
Victor Vieux
bad97e351a fix docker login when same username
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
2013-05-24 14:23:43 +00:00
Victor Vieux
317a026976 fix: Can't lookup root of unregistered image
Upstream-commit: 1c946ef0038a27d134f497ed72352136c0a4bb9e
Component: engine
2013-05-24 13:03:09 +00:00
Victor Vieux
4631590cee removed useless params
Upstream-commit: 4dab2fccd39858c0fb3b783a612fb95173d34f7b
Component: engine
2013-05-24 12:43:24 +00:00
Victor Vieux
0faea4838c change %f to %g
Upstream-commit: a7d7a0665573b3db46963e4eb083f24470aad082
Component: engine
2013-05-24 12:23:28 +00:00
Victor Vieux
aa6ea9bb08 bump to master
Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607
Component: engine
2013-05-24 12:17:44 +00:00
Guillaume J. Charmes
767f8e7e9d Add resize endpoint to api
Upstream-commit: 70d2123efda0e92760b96b03ce27cb4f1fb61cb3
Component: engine
2013-05-23 19:33:28 -07:00
Guillaume J. Charmes
d48f264028 remove unused function
Upstream-commit: 2cd00a47a5a8f405eb6a7b3f34edaf38c89e9b1c
Component: engine
2013-05-23 18:34:38 -07:00