Guillaume J. Charmes
7180d60d3a
Make sure that the layer exists prior to store it
...
Upstream-commit: be9dd7b85f889e31fbd93465535b9962ed585ced
Component: engine
2013-05-13 13:08:16 -07:00
Guillaume J. Charmes
e619b35202
Merge pull request #551 from jpetazzo/471-cpu-limit
...
+ Runtime: implement "-c" option to allocate a number of CPU shares to a container
Upstream-commit: edc7c092d926defa19d8b30dda7d3add38505ca0
Component: engine
2013-05-13 11:59:09 -07:00
Thatcher Peskens
48d58f0ec1
Merge remote-tracking branch 'dotcloud/master' into clean-reshuffle
...
Upstream-commit: 4551fbd700440d3f1e61285418475dc9f6173db3
Component: engine
2013-05-13 11:44:52 -07: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
Thatcher Peskens
9967e83f8f
Moved docker-remote-api doc to api section
...
Upstream-commit: 6390d2501088f74815adff5e1cb0ba5886ed057e
Component: engine
2013-05-13 11:21:28 -07:00
Thatcher Peskens
6cef827145
Merge remote-tracking branch 'dotcloud/master' into clean-reshuffle
...
Upstream-commit: 097531d8532d778faacac29ce6ff6c5b2766c473
Component: engine
2013-05-13 11:12:19 -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
Guillaume J. Charmes
a38dbce240
Merge pull request #587 from zimbatm/fix/readme-build-example
...
Fixes the README build example to make it work
Upstream-commit: 38bc134db330d4a2ecd4cb182fe551fdf5e4e624
Component: engine
2013-05-13 10:50:51 -07:00
Guillaume J. Charmes
9587a00519
Merge pull request #595 from dotcloud/typo_error-fix
...
Small fix about the error in push
Upstream-commit: 9023db5c5d944d2b0f4e3811e185d364eb553005
Component: engine
2013-05-13 10:46:38 -07:00
Guillaume J. Charmes
ba47986dfc
Change t.Skip to t.Log in tests for go1.0.3 compatibility
...
Upstream-commit: 824ad4274a6de5bacb67bce892faaeb0094977b2
Component: engine
2013-05-13 10:45:50 -07:00
Victor Vieux
31ce5f9a3a
fix error push
...
Upstream-commit: 182842e3c3cb56e8b2012629d06822c8f395e826
Component: engine
2013-05-13 19:19:27 +02:00
Victor Vieux
fc6ad3f15e
add -notrunc on docker images
...
Upstream-commit: e82ff22fae096e64e9ec0f621a532eaa62b40deb
Component: engine
2013-05-13 12:26:18 +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
Jonas Pfenniger
b4e5f29fcb
Fixes the README build example to make it work
...
Upstream-commit: a47d8799b190ba44d7bea2a39e05f98f6019f952
Component: engine
2013-05-11 23:50:06 +01:00
Ken Cochrane
0bf1d78235
Merge pull request #584 from boffbowsh/builder-documentation
...
* Documentation: Updated Docker builder docs to clean up format and add new information and examples
Upstream-commit: 908e4797a66715ca1011867aa6e13b10ee22dae6
Component: engine
2013-05-11 12:39:44 -07:00
Paul Bowsher
e8655eb27d
Make examples bash-highlighted
...
Remove DOCKER-VERSION, easier to maintain
Add example of multiple FROM steps
Upstream-commit: 9416574569b3969f1844c83cf4e24bc50957aaf5
Component: engine
2013-05-11 18:34:26 +01:00
Guillaume J. Charmes
ca65b7f821
Update api_test.go to reflect new api.go
...
Upstream-commit: b99446831f576d626f78be7baea09af8520d125b
Component: engine
2013-05-10 15:24:07 -07: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
Paul Bowsher
7ee4025569
Expand upon Builder documentation and tidy
...
Standardizes on uppercase for instructions, gives
example usage.
Wrap at 80 columns
Upstream-commit: a98eafaf58ea250d6cd75d2f175f66d705d4a0eb
Component: engine
2013-05-10 22:49:42 +01:00
Jérôme Petazzoni
3980cc1280
Merge branch 'master' of github.com:dotcloud/docker into 471-cpu-limit
...
Upstream-commit: 6f3e868a7b8f239334d06b2385b776ce7ae5614f
Component: engine
2013-05-10 14:44:50 -07:00
Guillaume J. Charmes
6656850748
Merge pull request #583 from dotcloud/api-tests-1
...
* Api: Improve remote api unit tests
Upstream-commit: d7adeb8a4569d84d80af1a1bc15ffa4e23e1ffc3
Component: engine
2013-05-10 14:34:02 -07:00
Guillaume J. Charmes
35b873eb52
- Registry: Fix the checksums file path
...
Upstream-commit: 052a15ace9bd6391ef1e935f949f986ee9840d47
Component: engine
2013-05-10 14:25:45 -07:00
Guillaume J. Charmes
5b93b96784
Small fix within TestGetImagesJson
...
Upstream-commit: ae80c37054835dc0cd55f81c9f97ca07ed80081c
Component: engine
2013-05-10 13:58:21 -07:00
Guillaume J. Charmes
c661f127d6
Improve remote api unit tests
...
Upstream-commit: 5bec9275c01f646ba6a5afd19ea80a38c41604a7
Component: engine
2013-05-10 12:28:07 -07:00
Thatcher Peskens
8767bd1f29
Updated commands index to show better title.
...
Small syntax fix in couchDB
Upstream-commit: 8946b75a0b8bce77f630020f6c0fcdae3404b922
Component: engine
2013-05-10 12:25:02 -07:00
Thatcher Peskens
0e4b996e2f
Major rearrange of the documentation.
...
Upstream-commit: 7557af19d8cc3fba858b3ab67cef4875b6097c42
Component: engine
2013-05-10 12:00:12 -07:00
Victor Vieux
da4960c20a
Merge pull request #575 from odk-/notrunc-container-id
...
full container.Id display when notrunc is used
Upstream-commit: d270501de21c026f06cd133a84ce11d20dd64bd8
Component: engine
2013-05-10 11:35:20 -07:00
Victor Vieux
ed0c3f4233
fix run
...
Upstream-commit: 17c1704f4a0be19c7a3e3c0d449aede2a6aae05b
Component: engine
2013-05-10 17:00:26 +02:00
Victor Vieux
25467fbd92
fix tests in api_test.go
...
Upstream-commit: 53a8229ce7f8d4d1dfb7a85a31ed25613a9f9813
Component: engine
2013-05-10 16:49:47 +02:00
odk-
603152d01a
full container.Id display when notrunc is used
...
Upstream-commit: 82313b1de9041896e33ddd8fab63924fb7bdebc3
Component: engine
2013-05-10 10:18:01 +02:00
Guillaume J. Charmes
5023ab483c
Merge pull request #571 from dotcloud/569-run_after_rmi-fix
...
fix run after rmi
Upstream-commit: 1c5e9f8a88a4323dfa18279d267055256234ea6e
Component: engine
2013-05-09 23:02:36 -07:00
Guillaume J. Charmes
53f7fab54d
Merge pull request #567 from dotcloud/516-xorg-ppa
...
+ Vagrant: packaging-ubuntu; issue #516 : Add xorg kernel to Vagrantfile for stable ubuntu LTS docker distro
Upstream-commit: fae63aa42e884b43cd7995aef7501c4988c2e54e
Component: engine
2013-05-09 23:01:48 -07:00
Guillaume J. Charmes
b668f8a643
Merge pull request #432 from dotcloud/remote-api
...
+ Remote API: Implement the remote API.
Upstream-commit: 26bfeb1d67ebe818be17d6f5bdd525b2447c5879
Component: engine
2013-05-09 22:43:47 -07:00
Guillaume J. Charmes
f612e63a59
Update the doc for remote-api
...
Upstream-commit: 9897e78e328152fa41f99bd53f7c3a6993c3f87a
Component: engine
2013-05-09 22:29:12 -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
e4c6fe6d42
Mock Hijack and Implement Unit test for Attach
...
Upstream-commit: 15ae314cbb8ede09a2d2c9e70c6a0d7d87817b64
Component: engine
2013-05-09 21:55:08 -07:00
Guillaume J. Charmes
c8215f011f
More unit tests for remote api
...
Upstream-commit: 310fec4819422ad7ee7a73543746bbd1977ef285
Component: engine
2013-05-09 21:54:43 -07:00
Guillaume J. Charmes
b1cb259eb1
Reduce the Destroy timeout from 10 to 3 seconds
...
Upstream-commit: 28fd289b448164b77affd8103c0d96fd8110daf9
Component: engine
2013-05-09 21:53:59 -07:00
Guillaume J. Charmes
3f51b4ea04
Fix typos whithin unit tests
...
Upstream-commit: 483c9425208fbc649cd12d157892be5a7ea92924
Component: engine
2013-05-09 21:53:28 -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
648408dc60
Add unit tests for remote api
...
Upstream-commit: ede0793d94e0bafcddc65b1fcb683169accffea3
Component: engine
2013-05-09 17:51:27 -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
Guillaume J. Charmes
4ef966aa4a
Add the variable maps to the Api functions
...
Upstream-commit: ff67da9c867d82192020e3840bd588acc959bcd3
Component: engine
2013-05-09 16:28:47 -07:00
Victor Vieux
0194a92f31
fixed private caller
...
Upstream-commit: add73641e6a84cabac82b7ee7a2d72d5d78f1cf4
Component: engine
2013-05-10 01:23:50 +02:00
Victor Vieux
f13fcae909
Merge branch 'remote-api' of https://github.com/dotcloud/docker into remote-api
...
Upstream-commit: 9af5d9c527192a4da02fb8331cea941a40f2e11a
Component: engine
2013-05-10 01:20:33 +02:00