Victor Vieux
|
694903e92c
|
removed the -f
Upstream-commit: 2eb4e2a0b86f8d244f0b6cbeb0422f8499d834f8
Component: engine
|
2013-05-29 16:31:47 +00:00 |
|
Victor Vieux
|
9c8c6a4ab3
|
merge master
Upstream-commit: ea9095c5626077c198e3fdbb480d6205851f027b
Component: engine
|
2013-05-29 11:49:39 +00:00 |
|
Solomon Hykes
|
a7da07b831
|
+ Runtime: stable implementation of 'docker build'
Upstream-commit: c7985808aea860d220ad8827cd21b042adef7934
Component: engine
|
2013-05-28 19:40:38 -07:00 |
|
Guillaume J. Charmes
|
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 |
|
Guillaume J. Charmes
|
57ef7f3ad5
|
Send error without headers when using chunks
Upstream-commit: fe0c0c208c0e816419b668a6fd6567520698c2d2
Component: engine
|
2013-05-28 15:21:06 -07:00 |
|
Guillaume J. Charmes
|
288bdc86e5
|
Make docker build flush output each line
Upstream-commit: 582a9e0a67598672db35ef26a18027dd6fb222ca
Component: engine
|
2013-05-28 13:47:04 -07:00 |
|
Guillaume J. Charmes
|
20562fdb8c
|
Fix merge issue
Upstream-commit: a48799016a43e6badae72e855f9a90592b6cdd98
Component: engine
|
2013-05-28 13:46:52 -07:00 |
|
Guillaume J. Charmes
|
d21f15c6b9
|
Merge master
Upstream-commit: dce82bc85615ca09c999bc2186c2c9caf348dc33
Component: engine
|
2013-05-28 13:42:50 -07:00 |
|
Guillaume J. Charmes
|
ef0eab1820
|
Add Extension() method to Compresison type
Upstream-commit: 54db18625aa7154c9dd230907444676fa3079b99
Component: engine
|
2013-05-28 13:37:49 -07: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 |
|
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
|
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
|
d66839e06f
|
Fix merge issue
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
|
2013-05-24 11:56:21 -07:00 |
|
Victor Vieux
|
10117596bb
|
first version of Pull
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
|
2013-05-24 16:34:03 +00:00 |
|
Victor Vieux
|
bad97e351a
|
fix docker login when same username
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
|
2013-05-24 14:23:43 +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 |
|
Guillaume J. Charmes
|
0efa7869ac
|
Implement Context within docker build (not yet in use)
Upstream-commit: d42c10aa094e39d8c1184b61c98777d8c59ae900
Component: engine
|
2013-05-23 18:32:56 -07:00 |
|
Victor Vieux
|
4904dcf8ba
|
jsonstream WIP
Upstream-commit: cf35e8ed81029a3c2717659eac7979017bb01890
Component: engine
|
2013-05-23 15:16:35 +00:00 |
|
Guillaume J. Charmes
|
b0dbe9b6ac
|
Start moving the docker builder into the server
Upstream-commit: 0f135ad7f31df2952352feb9ef00863d61577467
Component: engine
|
2013-05-22 20:07:26 -07:00 |
|
Victor Vieux
|
41d3215b3f
|
api versionning
Upstream-commit: faae7220c019882a2160aeea6bebc46c15d702be
Component: engine
|
2013-05-22 15:29:54 +00:00 |
|
Guillaume J. Charmes
|
3e19186e1e
|
Merge fix
Upstream-commit: 0d2fb295375ce74764b8d4cb2b03c19cd4e01cb4
Component: engine
|
2013-05-20 16:21:35 -07:00 |
|
Guillaume J. Charmes
|
1215d8cad2
|
Add "Cmd" prefix to builder instructions
Upstream-commit: c2a14bb196d0d3046e185783ebacd4b83fa36dd4
Component: engine
|
2013-05-20 12:09:15 -07:00 |
|
Victor Vieux
|
54c4bf20a4
|
add check to see if the image isn't parent of another and add -f to force
Upstream-commit: 67b20f2c8cc8d85ab09de95970e4d28c80f0aeb6
Component: engine
|
2013-05-20 18:31:45 +00:00 |
|
Guillaume J. Charmes
|
ce120b932a
|
Move docker build to client
Upstream-commit: 0f312113d3ce37d57fb28eb98c8abcdcbfcd39a3
Component: engine
|
2013-05-19 10:46:24 -07:00 |
|
Guillaume J. Charmes
|
3152a917ce
|
Remove hijack from api when not necessary
Upstream-commit: f29e5dc8a15d0ab8e9c6084e41ee373376051659
Component: engine
|
2013-05-16 12:09:06 -07:00 |
|
Victor Vieux
|
65f5bcf0ce
|
1 or 0 -> 1/True/true or 0/False/false
Upstream-commit: 0c5443571dd1c081d57b6b2840c30d86bef0e82c
Component: engine
|
2013-05-16 13:45:29 +00:00 |
|
Guillaume J. Charmes
|
f90a47c969
|
Merge pull request #618 from titanous/cleanup
Misc. cleanup
Upstream-commit: fef816163cf9713b7943025a8739717c971b269c
Component: engine
|
2013-05-15 18:05:31 -07:00 |
|
Guillaume J. Charmes
|
4f2b2696d3
|
Update tests to reflect new AuthConfig
Upstream-commit: 10e19e4b97dba71b603d652d5a046ef792d9d704
Component: engine
|
2013-05-15 17:31:11 -07:00 |
|
Guillaume J. Charmes
|
2d208e56c7
|
Move authConfig from runtime to registry
Upstream-commit: 95dd6d31a4c11618836f9a55fc3dbbde48450b09
Component: engine
|
2013-05-15 17:17:33 -07:00 |
|
Guillaume J. Charmes
|
d6276e6ddf
|
Allow to change login
Upstream-commit: bb85ce9aff118bed4e53e8ef70df4f1ec1cb903b
Component: engine
|
2013-05-15 13:39:24 -07:00 |
|
Jonathan Rudenberg
|
108f6407e1
|
Fix mistaken call to fmt.Println
Upstream-commit: 52ef89f9c20d02ca341c979e3d4cb8bd13aa0146
Component: engine
|
2013-05-15 15:52:19 -04:00 |
|
Guillaume J. Charmes
|
80593d4e7d
|
Reenable docker push
Upstream-commit: 2f4de3867d77f8f8841ba32517f2ca8b9e730113
Component: engine
|
2013-05-15 19:21:37 +00:00 |
|
Guillaume J. Charmes
|
88a9363cae
|
Split registry into subpackage
Upstream-commit: 9bb3dc9843f4ef565eb8f298eb7f542b5e1ac0dd
Component: engine
|
2013-05-15 01:41:39 +00:00 |
|
Guillaume J. Charmes
|
bc6fad489c
|
Create a subpackage for utils
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
|
2013-05-14 22:37:35 +00:00 |
|
Guillaume J. Charmes
|
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 |
|
Guillaume J. Charmes
|
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 |
|
Victor Vieux
|
31ce5f9a3a
|
fix error push
Upstream-commit: 182842e3c3cb56e8b2012629d06822c8f395e826
Component: engine
|
2013-05-13 19:19:27 +02:00 |
|
Victor Vieux
|
ad78d7afdf
|
removed only_ids and trunc_cmd from the api
Upstream-commit: 1990c49a6235530a3ddedc00db3aa38acf93a9c5
Component: engine
|
2013-05-13 12:18:55 +02:00 |
|
Victor Vieux
|
5f800aea13
|
fix error message in export
Upstream-commit: 8b31d30601f487bca5e4985c6a14b89e47ac83be
Component: engine
|
2013-05-13 11:39:24 +02:00 |
|
Victor Vieux
|
d37c246e03
|
add writeJson
Upstream-commit: f7beba3accf22f1549aef9ed70bbde2afbdc4af0
Component: engine
|
2013-05-10 15:10:15 -07:00 |
|
Victor Vieux
|
8ca9fad1fc
|
refactor api.go
Upstream-commit: 7cc082347f4adf3188c9614a9e9a82c2d6ff5656
Component: engine
|
2013-05-10 15:10:15 -07:00 |
|
Guillaume J. Charmes
|
c661f127d6
|
Improve remote api unit tests
Upstream-commit: 5bec9275c01f646ba6a5afd19ea80a38c41604a7
Component: engine
|
2013-05-10 12:28:07 -07:00 |
|
Guillaume J. Charmes
|
2e7740543f
|
make commands use the correct routes
Upstream-commit: 1941c7919532b261984214ce4dc6a7927154d9e9
Component: engine
|
2013-05-09 22:28:52 -07:00 |
|
Guillaume J. Charmes
|
c97d9c8b66
|
Update the routes within commands.go
Upstream-commit: eeaea4e873a4850a24e300461975e5d9636fef08
Component: engine
|
2013-05-09 20:19:21 -07:00 |
|
Guillaume J. Charmes
|
f7a60e000e
|
Add/improve unit tests
Upstream-commit: 24816a8b80cb9d5b97d876f99a8300924f6abf9c
Component: engine
|
2013-05-09 20:13:52 -07:00 |
|
Guillaume J. Charmes
|
fe9bc15b8d
|
Rename "v" in "removeVolume"
Upstream-commit: 0c6380cc3237ac9eb1947223479ee13253d04287
Component: engine
|
2013-05-09 19:19:55 -07:00 |
|
Guillaume J. Charmes
|
ad97f9e37e
|
Add unit tests
Upstream-commit: 2a303dab8594420b6b7908183a73c5d744b1e66b
Component: engine
|
2013-05-09 19:19:24 -07:00 |
|
Guillaume J. Charmes
|
725fad8955
|
Change API route for containers/ and images/ in order to avoid conflict
Upstream-commit: 152ebeea4327c3240e211b96b5858063f0ee468b
Component: engine
|
2013-05-09 17:50:56 -07:00 |
|