9a8934c1afFix attach API docs. Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc Component: engine
Mark McGranaghan
2013-05-28 06:27:12 -07:00
3d5929f437remove hijack on the client in logs, and split stdout / stderr Upstream-commit: fbcd8503b3a29bdbb7a52d6433b0ab79877bc4ce Component: engine
Victor Vieux
2013-05-27 16:07:05 +00:00
037b9b6160fix json encoding, and use less casts Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014 Component: engine
Victor Vieux
2013-05-26 23:45:45 +00:00
03c163a915set architecture to x86_64 by default
unclejack
2013-05-24 21:42:09 +03:00
57720219a1Merge pull request #657 from offby1/master
Guillaume J. Charmes
2013-05-24 19:19:32 -07:00
fdc407078f* Registry: specified naming restrictions for usernames and repository names Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14 Component: engine
Solomon Hykes
2013-05-24 18:58:24 -07:00
0fb224b331Fix a unit test broken by pull request #703 Upstream-commit: bb4b35a8920bcba8b60784297650ced5b2e01e47 Component: engine
Solomon Hykes
2013-05-24 18:32:21 -07:00
2b6649e390Added FIXME about possible race condition in a unit test Upstream-commit: 194f48774992644257bf7cf0878e47e9834d40e1 Component: engine
Solomon Hykes
2013-05-24 18:31:47 -07:00
d6fea566f0* Remote API: send push/pull progress bar as json Upstream-commit: 9775f0bd145c607126ea22a17b291dea822be7b2 Component: engine
Solomon Hykes
2013-05-24 17:59:27 -07:00
c6994a2dbaMerge pull request #710 from dotcloud/tty_resize
Guillaume J. Charmes
2013-05-24 15:12:22 -07:00
3ba5b8785aMerge pull request #661 from dotcloud/573-add_host_port-feature
Guillaume J. Charmes
2013-05-24 11:32:57 -07:00
e668458c4bSimplify the Host flag parsing Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381 Component: engine
Guillaume J. Charmes
2013-05-24 11:31:36 -07:00
0575fdb313Fix issue within auth test Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360 Component: engine
Guillaume J. Charmes
2013-05-24 11:31:11 -07:00
2b0dd49ab1Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work Upstream-commit: 8dc2ad2c06fabb6501f0adff80761898bed5bc6f Component: engine
kim0
2013-05-24 17:44:02 +02:00
5e71f995b8Merge pull request #699 from dotcloud/docker_login-fix
Victor Vieux
2013-05-24 07:32:38 -07:00
bad97e351afix docker login when same username Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497 Component: engine
Victor Vieux
2013-05-24 14:23:43 +00:00
317a026976fix: Can't lookup root of unregistered image Upstream-commit: 1c946ef0038a27d134f497ed72352136c0a4bb9e Component: engine
Victor Vieux
2013-05-24 13:03:09 +00:00
0faea4838cchange %f to %g Upstream-commit: a7d7a0665573b3db46963e4eb083f24470aad082 Component: engine
Victor Vieux
2013-05-24 12:23:28 +00:00
aa6ea9bb08bump to master Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607 Component: engine
Victor Vieux
2013-05-24 12:17:44 +00:00
767f8e7e9dAdd resize endpoint to api Upstream-commit: 70d2123efda0e92760b96b03ce27cb4f1fb61cb3 Component: engine
Guillaume J. Charmes
2013-05-23 19:33:28 -07:00
d48f264028remove unused function Upstream-commit: 2cd00a47a5a8f405eb6a7b3f34edaf38c89e9b1c Component: engine
Guillaume J. Charmes
2013-05-23 18:34:38 -07:00
0efa7869acImplement Context within docker build (not yet in use) Upstream-commit: d42c10aa094e39d8c1184b61c98777d8c59ae900 Component: engine
Guillaume J. Charmes
2013-05-23 18:32:56 -07:00
555e20248fMerge pull request #695 from dtzWill/694-fix-merge-config
Guillaume J. Charmes
2013-05-23 16:00:34 -07:00
ba9a93959autils.go: Fix merge logic for user and hostname.
Will Dietz
2013-05-23 15:48:50 -05:00
a518559330Bumped version to 0.3.3 Upstream-commit: 822056094aa31c224e78cd568e02fe5458a0eecc Component: engine
Guillaume J. Charmes
2013-05-23 12:46:14 -07:00
7e99dbb632Packaging: Update changelog for release 0.3.3 Upstream-commit: d17c0b83681d45f4b4c57ca66cfc574246fd6618 Component: engine
Daniel Mizyrycki
2013-05-23 12:42:58 -07:00
0806baee13* Build: leave temporary containers untouched after a failure to help debugging Upstream-commit: e0e385ac696c339958cdb9b4094c25f120dae1ec Component: engine
Solomon Hykes
2013-05-23 11:12:54 -06:00
95bff3248eswitch to default 127.0.0.1, and mixed the two flags in one. -h Upstream-commit: 13f1939a6316079c14bac5434ecc2c955af1d1fb Component: engine
Victor Vieux
2013-05-23 16:09:28 +00:00
149569d0dfRe-ordered and re-titled kernel requirement details to match the shortlist Upstream-commit: dbb7b60cfc97dc1b7a1412775475048b6bf18e67 Component: engine
Solomon Hykes
2013-05-23 09:49:53 -06:00
349847e8baFixing two typos in the run help Upstream-commit: 9e0427081e80dbf6c7702c8428ec64e40f362804 Component: engine
Andreas Tiefenthaler
2013-05-23 18:09:59 +03:00
183381f196switch to SI standard and add test Upstream-commit: b45143da9b275b5003c23667b0988ad93f383b11 Component: engine
Victor Vieux
2013-05-23 10:29:09 +00:00
b0dbe9b6acStart moving the docker builder into the server Upstream-commit: 0f135ad7f31df2952352feb9ef00863d61577467 Component: engine
Guillaume J. Charmes
2013-05-22 20:07:26 -07:00
1ac07a6fadMerge pull request #683 from rogaha/doc_meta_info_update
Thatcher
2013-05-22 19:09:32 -07:00
7040df6614added/modifed tittle, description and keywords changed the title prefix to sufix + Documentation Upstream-commit: 18cb5c9314dbc9a0aa857211b124a3feb85c5274 Component: engine
rogaha
2013-05-21 11:47:16 -06:00
71cdc783eaMerge pull request #681 from dhrp/680-fix-readme-image
Thatcher
2013-05-22 16:09:21 -07:00
de6c1ab33bUse 127.0.0.1 instead of hostname in the "access the web app" section. Upstream-commit: 056698b67678d7dd687e08401386c35cd5cb9d77 Component: engine
Eric Hanchrow
2013-05-22 12:54:50 -07:00
196dbee62cMerge remote-tracking branch 'upstream/master'
Eric Hanchrow
2013-05-22 12:52:14 -07:00
c981be44f5improved doc and usage Upstream-commit: 800b401f0ba706f8f09b5beacd335caf4548e63c Component: engine
Victor Vieux
2013-05-22 16:15:52 +00:00
6b8b1213b3Merge pull request #668 from christophercurrie/patch-1
Ken Cochrane
2013-05-22 07:52:46 -07:00
c1e66110cbMerge pull request #670 from dotcloud/669-wrong_content_type_create-fix
Victor Vieux
2013-05-22 06:54:39 -07:00
e974a23746fix content type in doc Upstream-commit: 949a649cc2364f796daae14fa3b044432e25efdf Component: engine
Victor Vieux
2013-05-22 13:49:12 +00:00
8c3121bf04bump to master Upstream-commit: 6fce89e60b71ee2306d66003697b6c746c456250 Component: engine
Victor Vieux
2013-05-22 13:41:29 +00:00
eb4c932affApparent typos in the docs. Upstream-commit: 5818813183bfb61180846f2b1b23a6fdcb2c9cdd Component: engine
Christopher Currie
2013-05-21 21:45:27 -06:00
22c50f73c6add regexp check on repo's name Upstream-commit: 4489005cb2f11fe6e2dcdb181b4834791de3b73f Component: engine
Victor Vieux
2013-05-21 12:53:05 +00:00
726c3246c2add -host and -port Upstream-commit: a3ccec197e847a996e725d87177067dba98bcca6 Component: engine
Victor Vieux
2013-05-21 10:14:58 +00:00
ad4dccdc0fMerge pull request #658 from dotcloud/builder_client_doc
Guillaume J. Charmes
2013-05-20 18:14:44 -07:00
3c7eed1673Remove no longer needed tests Upstream-commit: 3f22842542a17d41f72b4943d19d244f2296b418 Component: engine
Guillaume J. Charmes
2013-05-20 17:54:54 -07:00
9ef178686dMerge pull request #653 from dotcloud/builder_client
Guillaume J. Charmes
2013-05-20 17:50:17 -07:00
e1a5e6c271Fix an issue trying to pull specific tag Upstream-commit: 49505c599b3a65196b6b6f746f4bfad3a417dd7a Component: engine
Guillaume J. Charmes
2013-05-20 17:30:33 -07:00
8cf91cef6bUse pointers for the object methods Upstream-commit: f35f084059e5c34940f74f55ad32ecfcd78ce61c Component: engine
Guillaume J. Charmes
2013-05-20 16:35:28 -07:00
78fdb08a7eInstall curl; nix stray backslash; use proper IP address Upstream-commit: 3a9ef5f9bbae19ae5ac4108dbbaed649e26d942e Component: engine
Eric Hanchrow
2013-05-20 16:29:57 -07:00
11382da61cAllow multiple syntaxes for CMD Upstream-commit: 13e687e5790f05552f9be84bf1d60d37fca4c078 Component: engine
Guillaume J. Charmes
2013-05-20 16:00:51 -07:00
e4d2026b9cMake docker client an interface Upstream-commit: b06784b0dd2e86a7450fab30707468acfae5d7aa Component: engine
Guillaume J. Charmes
2013-05-20 16:00:16 -07:00
d4d1d3980dTag all images after pulling them Upstream-commit: d756ae4cb376e218ff4dd35a7b9a9fa346fbb04d Component: engine
Guillaume J. Charmes
2013-05-20 15:19:05 -07:00
aca8345b41Isolate run() from commit Upstream-commit: c6bc90d02daa2f7086a1c7469c7239911c2bc357 Component: engine
Guillaume J. Charmes
2013-05-20 15:02:32 -07:00
73e1ea3706Make sure to have a command to execute upon commit Upstream-commit: b51303cddce2cbb22fc3ee0de9d9125bec2f029a Component: engine
Guillaume J. Charmes
2013-05-20 13:50:50 -07:00
1215d8cad2Add "Cmd" prefix to builder instructions Upstream-commit: c2a14bb196d0d3046e185783ebacd4b83fa36dd4 Component: engine
Guillaume J. Charmes
2013-05-20 12:09:15 -07:00
54c4bf20a4add check to see if the image isn't parent of another and add -f to force Upstream-commit: 67b20f2c8cc8d85ab09de95970e4d28c80f0aeb6 Component: engine
Victor Vieux
2013-05-20 18:31:45 +00:00
4582eb4dafMerge pull request #625 from dotcloud/remove-hijack
Guillaume J. Charmes
2013-05-20 11:27:07 -07:00
a82b37a1d2Avoid cast each write for flusher Upstream-commit: ae9d7a5167da58de9a1a4beac489cf1e6adcea11 Component: engine
Guillaume J. Charmes
2013-05-20 10:58:35 -07:00
02712aaba2Merge pull request #652 from unclejack/fix-compilation-on-linux
Guillaume J. Charmes
2013-05-20 10:55:17 -07:00
543cef1b6dfix compilation on linux Upstream-commit: 1b007828c93bc472af3306b8da1d72a84b484f12 Component: engine
unclejack
2013-05-20 20:43:09 +03:00
73460590baMake the printflfush an interface Upstream-commit: 98b0fd173b7b59316d776534b84ecc9ab0a1da77 Component: engine
Guillaume J. Charmes
2013-05-20 10:22:50 -07:00
6c6cf1e168Merge pull request #639 from fsouza/fix-utils-darwin
Guillaume J. Charmes
2013-05-20 10:10:30 -07:00