Commit Graph

104 Commits

Author SHA1 Message Date
4747c5b99f linted names
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
934fcbd514 Merge pull request #719 from dotcloud/json_stream-feature
* API: push, pull, import, insert -> Json Stream
Upstream-commit: 9bc71c101c8f1299427013bfb5503bf85173c28f
Component: engine
2013-05-31 16:05:15 -07:00
3efe0a345b returns an error if the container we want to attach is not running
Upstream-commit: 468e4c4b565d25b03c68ce2ab31f9a52f7b3398a
Component: engine
2013-05-31 15:34:23 +00:00
0319ab95bb Add -t to docker build in order to tag resulting image
Upstream-commit: 56431d3130f8a48cfb708509cbe39682f7fe841c
Component: engine
2013-05-30 12:08:21 -07:00
167d529e1c ensure progress downloader is well formated
Upstream-commit: cd002a4d162aa273cd9e646e6fd124ef2b6f6944
Component: engine
2013-05-30 17:00:42 +00:00
f8799691fc Merge pull request #739 from dotcloud/push_issue-1
- Registry: Cereate a new registry object for each request (~session)
Upstream-commit: 08e5f1295487f2c06639bc8ac97be35f30359534
Component: engine
2013-05-29 09:22:12 -07:00
06534c45f7 bump to master
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
2013-05-29 13:52:18 +00:00
a7da07b831 + Runtime: stable implementation of 'docker build'
Upstream-commit: c7985808aea860d220ad8827cd21b042adef7934
Component: engine
2013-05-28 19:40:38 -07:00
f9738020b7 Update tests with new cookies for registry
Upstream-commit: b76d6120ac66a853d177f7e53318ab1ee75dca92
Component: engine
2013-05-28 17:35:10 -07:00
cbc5080648 Cereate a new registry object for each request (~session)
Upstream-commit: cd0de83917e775fcdcd3ce4e592b627b7eeeac64
Component: engine
2013-05-28 17:12:24 -07:00
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
57ef7f3ad5 Send error without headers when using chunks
Upstream-commit: fe0c0c208c0e816419b668a6fd6567520698c2d2
Component: engine
2013-05-28 15:21:06 -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
ef0eab1820 Add Extension() method to Compresison type
Upstream-commit: 54db18625aa7154c9dd230907444676fa3079b99
Component: engine
2013-05-28 13:37:49 -07: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
037b9b6160 fix json encoding, and use less casts
Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014
Component: engine
2013-05-26 23:45:45 +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
d6fea566f0 * Remote API: send push/pull progress bar as json
Upstream-commit: 9775f0bd145c607126ea22a17b291dea822be7b2
Component: engine
2013-05-24 17:59:27 -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
d66839e06f Fix merge issue
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
2013-05-24 11:56:21 -07:00
10117596bb first version of Pull
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
bad97e351a fix docker login when same username
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
2013-05-24 14:23:43 +00:00
767f8e7e9d Add resize endpoint to api
Upstream-commit: 70d2123efda0e92760b96b03ce27cb4f1fb61cb3
Component: engine
2013-05-23 19:33:28 -07:00
d48f264028 remove unused function
Upstream-commit: 2cd00a47a5a8f405eb6a7b3f34edaf38c89e9b1c
Component: engine
2013-05-23 18:34:38 -07:00
0efa7869ac Implement Context within docker build (not yet in use)
Upstream-commit: d42c10aa094e39d8c1184b61c98777d8c59ae900
Component: engine
2013-05-23 18:32:56 -07:00
4904dcf8ba jsonstream WIP
Upstream-commit: cf35e8ed81029a3c2717659eac7979017bb01890
Component: engine
2013-05-23 15:16:35 +00:00
b0dbe9b6ac Start moving the docker builder into the server
Upstream-commit: 0f135ad7f31df2952352feb9ef00863d61577467
Component: engine
2013-05-22 20:07:26 -07:00
41d3215b3f api versionning
Upstream-commit: faae7220c019882a2160aeea6bebc46c15d702be
Component: engine
2013-05-22 15:29:54 +00:00
3e19186e1e Merge fix
Upstream-commit: 0d2fb295375ce74764b8d4cb2b03c19cd4e01cb4
Component: engine
2013-05-20 16:21:35 -07:00
1215d8cad2 Add "Cmd" prefix to builder instructions
Upstream-commit: c2a14bb196d0d3046e185783ebacd4b83fa36dd4
Component: engine
2013-05-20 12:09:15 -07:00
ce120b932a Move docker build to client
Upstream-commit: 0f312113d3ce37d57fb28eb98c8abcdcbfcd39a3
Component: engine
2013-05-19 10:46:24 -07:00
3152a917ce Remove hijack from api when not necessary
Upstream-commit: f29e5dc8a15d0ab8e9c6084e41ee373376051659
Component: engine
2013-05-16 12:09:06 -07:00
65f5bcf0ce 1 or 0 -> 1/True/true or 0/False/false
Upstream-commit: 0c5443571dd1c081d57b6b2840c30d86bef0e82c
Component: engine
2013-05-16 13:45:29 +00:00
f90a47c969 Merge pull request #618 from titanous/cleanup
Misc. cleanup
Upstream-commit: fef816163cf9713b7943025a8739717c971b269c
Component: engine
2013-05-15 18:05:31 -07:00
4f2b2696d3 Update tests to reflect new AuthConfig
Upstream-commit: 10e19e4b97dba71b603d652d5a046ef792d9d704
Component: engine
2013-05-15 17:31:11 -07:00
2d208e56c7 Move authConfig from runtime to registry
Upstream-commit: 95dd6d31a4c11618836f9a55fc3dbbde48450b09
Component: engine
2013-05-15 17:17:33 -07:00
d6276e6ddf Allow to change login
Upstream-commit: bb85ce9aff118bed4e53e8ef70df4f1ec1cb903b
Component: engine
2013-05-15 13:39:24 -07:00
108f6407e1 Fix mistaken call to fmt.Println
Upstream-commit: 52ef89f9c20d02ca341c979e3d4cb8bd13aa0146
Component: engine
2013-05-15 15:52:19 -04:00
80593d4e7d Reenable docker push
Upstream-commit: 2f4de3867d77f8f8841ba32517f2ca8b9e730113
Component: engine
2013-05-15 19:21:37 +00:00
88a9363cae Split registry into subpackage
Upstream-commit: 9bb3dc9843f4ef565eb8f298eb7f542b5e1ac0dd
Component: engine
2013-05-15 01:41:39 +00:00
bc6fad489c Create a subpackage for utils
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
57b43e0549 Merge pull request #593 from dotcloud/579-move_display_options_to_client-feature
* Api: Move display options to client
Upstream-commit: 37b80325d0b20a0a5c85dd0eb3b49126a799204a
Component: engine
2013-05-13 11:40:46 -07:00
b6bfefb151 Merge pull request #591 from dotcloud/590_error_message-fix
Fix error message in export
Upstream-commit: 02d255457ae96cb8dca38c82317c9760b41c11e5
Component: engine
2013-05-13 10:58:05 -07:00
31ce5f9a3a fix error push
Upstream-commit: 182842e3c3cb56e8b2012629d06822c8f395e826
Component: engine
2013-05-13 19:19:27 +02:00
ad78d7afdf removed only_ids and trunc_cmd from the api
Upstream-commit: 1990c49a6235530a3ddedc00db3aa38acf93a9c5
Component: engine
2013-05-13 12:18:55 +02:00
5f800aea13 fix error message in export
Upstream-commit: 8b31d30601f487bca5e4985c6a14b89e47ac83be
Component: engine
2013-05-13 11:39:24 +02:00