1e4dfca884
Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
...
* API: rename containers/ps to containers/json
Upstream-commit: f65327555e00dcfb2691e8a2df1c57cb011a0898
Component: engine
2013-05-28 15:44:20 -07:00
811f5115c3
Merge pull request #732 from dotcloud/718-return_no_such_container_as_404-fix
...
- API: return 404 on no such containers in /attach
Upstream-commit: 7aa0d11171db90603313c887d260d13224501a93
Component: engine
2013-05-28 15:43:07 -07:00
9b55c462fd
Make sure the last line of docker build is the image id
...
Upstream-commit: 54af0536232ca71d37f7c6440f1bb17b3ed112db
Component: engine
2013-05-28 15:40:22 -07:00
2c506017f0
Readd build tests
...
Upstream-commit: 5b33b2463a27aa3356a4b6200cf4b81dd83c26a0
Component: engine
2013-05-28 15:31:06 -07:00
78cacea353
Fill the multipart writer directly instead of using reader
...
Upstream-commit: 2127f8d6ad091d699d3462715305a0f64340eca1
Component: engine
2013-05-28 15:22:34 -07:00
4fefd78435
Add directory contents instead of while directory for docker build
...
Upstream-commit: 2897cb04760d7e4e7e52ccc20e94c94e3743667e
Component: engine
2013-05-28 15:22:01 -07:00
57ef7f3ad5
Send error without headers when using chunks
...
Upstream-commit: fe0c0c208c0e816419b668a6fd6567520698c2d2
Component: engine
2013-05-28 15:21:06 -07:00
f9120d99fa
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 522f399d689ebd7ae76ffce07507549ee5887238
Component: engine
2013-05-28 14:57:50 -07:00
f4d5babfe8
De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo.
...
Upstream-commit: 326faec6642896954ffbd407eeda7d19da193856
Component: engine
2013-05-28 14:57:36 -07:00
49e1d5125f
Merge pull request #702 from kim0/patch-2
...
Properly install ppa, avoid GPG key warning. Also closes #715
Upstream-commit: 28a30eda880ceac876c6ce3791672bf1e6b2ebe5
Component: engine
2013-05-28 14:17:59 -07:00
430cc6b531
Removed deprecated SPECS directory
...
Upstream-commit: 387eb5295a9ea75a099dd36adcae18229541f613
Component: engine
2013-05-28 14:13:20 -07:00
da7e3d29eb
Merge pull request #733 from meejah/master
...
Documentation: Use add-apt-repository instead of editing sources.list
Upstream-commit: f3cc1d985e91e19012c65c0c14c4ddc664438631
Component: engine
2013-05-28 13:55:11 -07:00
a6fa39e648
Small fix
...
Upstream-commit: cfb8cbe5214c58690ca99cd44b25bd202c4dbcf7
Component: engine
2013-05-28 13:51:21 -07:00
288bdc86e5
Make docker build flush output each line
...
Upstream-commit: 582a9e0a67598672db35ef26a18027dd6fb222ca
Component: engine
2013-05-28 13:47:04 -07:00
20562fdb8c
Fix merge issue
...
Upstream-commit: a48799016a43e6badae72e855f9a90592b6cdd98
Component: engine
2013-05-28 13:46:52 -07:00
d21f15c6b9
Merge master
...
Upstream-commit: dce82bc85615ca09c999bc2186c2c9caf348dc33
Component: engine
2013-05-28 13:42:50 -07:00
584cc8079a
Update the UI for docker build
...
Upstream-commit: 90ffcda05547332020ec6f2b98179380f7d0e56f
Component: engine
2013-05-28 13:38:40 -07:00
dda3557a3e
Implement the CmdAdd instruction
...
Upstream-commit: 6ae3800151025ff73a97c40af578ee714164003b
Component: engine
2013-05-28 13:38:26 -07:00
ef0eab1820
Add Extension() method to Compresison type
...
Upstream-commit: 54db18625aa7154c9dd230907444676fa3079b99
Component: engine
2013-05-28 13:37:49 -07:00
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
ca4176193b
Add sudo to commands.
...
Upstream-commit: 444f7020cbc639fd781744be207c843aaf663077
Component: engine
2013-05-28 10:56:26 -06:00
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
b292d69f2b
return 404 on no such containers in /attach
...
Upstream-commit: e5fa4a4956393afc473539710e2a4b7297eb6ebf
Component: engine
2013-05-28 16:19:12 +00:00
a20c31a039
rename containers/ps to containers/json
...
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
663bde65c3
documentation
...
Upstream-commit: 8699805756d25602e2412173aac7364fbe9627c7
Component: engine
2013-05-28 15:49:57 +00:00
c51ff0dbbf
invert status created
...
Upstream-commit: d9670f427522fc847313ad1b94b1e288dafe7690
Component: engine
2013-05-28 15:06:26 +00:00
9a8934c1af
Fix attach API docs.
...
Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc
Component: engine
2013-05-28 06:27:12 -07:00
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
037b9b6160
fix json encoding, and use less casts
...
Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014
Component: engine
2013-05-26 23:45:45 +00:00
b088e2de70
ensure valid json
...
Upstream-commit: 14212930e40439d0cfc635d56e084736867f9e30
Component: engine
2013-05-25 15:51:26 +00:00
04ca200a24
imporved error, push, import insert
...
Upstream-commit: c8c7094b2e8088210e2182e582264e09222c6e3d
Component: engine
2013-05-25 15:09:46 +00:00
7a922259e1
add error handling
...
Upstream-commit: cb0bc4adc297baeea8e7b74269765c35457e04e7
Component: engine
2013-05-25 14:12:02 +00:00
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
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
fdc407078f
* Registry: specified naming restrictions for usernames and repository names
...
Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14
Component: engine
2013-05-24 18:58:24 -07:00
0fb224b331
Fix a unit test broken by pull request #703
...
Upstream-commit: bb4b35a8920bcba8b60784297650ced5b2e01e47
Component: engine
2013-05-24 18:32:21 -07:00
2b6649e390
Added FIXME about possible race condition in a unit test
...
Upstream-commit: 194f48774992644257bf7cf0878e47e9834d40e1
Component: engine
2013-05-24 18:31:47 -07:00
d6fea566f0
* Remote API: send push/pull progress bar as json
...
Upstream-commit: 9775f0bd145c607126ea22a17b291dea822be7b2
Component: engine
2013-05-24 17:59:27 -07:00
fe4868dfd9
Fix merge issue
...
Upstream-commit: b438565609917439cb4172717e5505c265c4e291
Component: engine
2013-05-24 14:48:13 -07:00
8e3c67a46e
Merge branch 'master' into tty_resize
...
Conflicts:
commands.go
Upstream-commit: ffd9e06deb9d222ac5e1f63734211c0503213e06
Component: engine
2013-05-24 14:45:31 -07:00
c479ea1a4b
Finish resize implementation client and server
...
Upstream-commit: 88ef309a940bcbb6f85a750372b8fdbc6569c3a7
Component: engine
2013-05-24 14:44:16 -07:00
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
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
d66839e06f
Fix merge issue
...
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
2013-05-24 11:56:21 -07:00
db38840f84
Merge branch 'master' into help_command-fix
...
Conflicts:
commands.go
Upstream-commit: 3d1bc2660c626d755582929b2e6229bfa8b625aa
Component: engine
2013-05-24 11:46:18 -07:00
39f3a9ee0e
add arch field to image struct
...
Upstream-commit: 2cf92abf0eff49b21812d88e74813b8848f9b758
Component: engine
2013-05-24 21:41:30 +03:00
e668458c4b
Simplify the Host flag parsing
...
Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381
Component: engine
2013-05-24 11:31:36 -07:00
68053e95b6
Gofmt
...
Upstream-commit: ae72c2f4d6c37a14fcd81658f6ae42d65f5c7169
Component: engine
2013-05-24 11:31:19 -07:00
0575fdb313
Fix issue within auth test
...
Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360
Component: engine
2013-05-24 11:31:11 -07:00
b350e4c829
Catch sigwinch client
...
Upstream-commit: deb9963e6e5871d53ab1d75c90bbf2da53ffcb36
Component: engine
2013-05-24 11:07:32 -07:00
