Guillaume J. Charmes
1f9f3aab64
Fix routes in api.go
...
Upstream-commit: 755604a2bdcaa47ad1ef827be021c9997002d311
Component: engine
2013-05-07 17:35:33 -07:00
Guillaume J. Charmes
fdcdf1dbe5
Factorize api.go
...
Upstream-commit: 891c5202ead662d9c8a3147f691e719106e0f20a
Component: engine
2013-05-07 17:27:09 -07:00
Guillaume J. Charmes
3385421b84
Use bool instead of string for flags
...
Upstream-commit: ab96da8eb2c81a90e5c081da26ee49c3af2f1ca5
Component: engine
2013-05-07 16:47:43 -07:00
Guillaume J. Charmes
d8a225f5d5
Use Fprintf instead of Fprintln
...
Upstream-commit: 279db68b4600551706dd1185ad1b05b374e9e05c
Component: engine
2013-05-07 16:36:49 -07:00
Guillaume J. Charmes
455a7b25f7
Refactor api.go to use a factory with named functions
...
Upstream-commit: b56b2da5c5ac9c65c07d33844a4c2ceeb36bbf6a
Component: engine
2013-05-07 16:33:12 -07:00
Victor Vieux
4209e6bbd1
removed useless buffered pipe in import
...
Upstream-commit: a0880edc6337054725abc9e8338550bc5258f4ab
Component: engine
2013-05-07 23:56:45 +02:00
Victor Vieux
e00d8a8fdf
removed RAW mode on server
...
Upstream-commit: 4d30a32c68c199a1e10e68729feb519b74da2961
Component: engine
2013-05-07 23:15:42 +02:00
Victor Vieux
799d4545bd
remove useless wait in run
...
Upstream-commit: a5b765a769736171d05692aff3abdf3f02dfe5be
Component: engine
2013-05-07 22:52:58 +02:00
Victor Vieux
11b6afb566
display id on run -s stdin
...
Upstream-commit: ac0e27699c0dd9306ae0edabeff5d462399c8e74
Component: engine
2013-05-07 21:36:24 +02:00
Victor Vieux
8ba22c1167
Merge branch 'master' into remote-api
...
Upstream-commit: 32cbd72ebeedfd6be71cf840f8b56a19e2c0e64c
Component: engine
2013-05-07 21:02:32 +02:00
Victor Vieux
2a0cf81ee6
fix run no parameter
...
Upstream-commit: 40794113750a3d21e784e2521ae517f23a081135
Component: engine
2013-05-07 20:59:04 +02:00
Jérôme Petazzoni
84ab689e05
propagate CpuShares in mergeConfig
...
Upstream-commit: eef8b0d406412ffe6622ed1f2c858540eb7f75f1
Component: engine
2013-05-07 11:44:38 -07:00
Jérôme Petazzoni
65d10241c4
in the tests, use a non-default value for cpu.shares
...
Upstream-commit: af9f559f2ebd6438f37fef890f2a25eca590f252
Component: engine
2013-05-07 11:44:24 -07:00
Jérôme Petazzoni
8ac133e820
if -c is not specified, do not set cpu.shares (instead of using the default value of 1024)
...
Upstream-commit: e36752e03347bf46177d8ee810cdd5a019321dc9
Component: engine
2013-05-07 11:43:45 -07:00
Victor Vieux
521aa8b1ce
added search
...
Upstream-commit: 59a6316f5e0810009f5986d62f1707f8d0a6650e
Component: engine
2013-05-07 20:43:31 +02:00
Guillaume J. Charmes
2c41182b97
Merge pull request #539 from justone/fix-byparent
...
- Images: fix ByParent function
Upstream-commit: 7b1ec9ff30a0b239466a47b576c1352069fe7688
Component: engine
2013-05-07 11:34:59 -07:00
Guillaume J. Charmes
bff143f914
Merge pull request #550 from unclejack/handle-empty-kernel-flavor-without-dash
...
* Runtime: kernel version - don't show the dash if flavor is empty
Upstream-commit: 244e6022ec114350a0b417fa4a432128789f9e8a
Component: engine
2013-05-07 11:24:25 -07:00
Guillaume J. Charmes
e782d4332d
Merge pull request #552 from dotcloud/548-no_command_panic-fix
...
- Builder: Check the command existance prior create and add Unit tests for the case
Upstream-commit: f8dd04d567c4aa212bb2998a7db5fb016b340ed8
Component: engine
2013-05-07 11:19:34 -07:00
Guillaume J. Charmes
664f8fbbbd
Check the command existance prior create and add Unit tests for the case
...
Upstream-commit: 42b1ea4889cd61790f81001ada5deac9354be378
Component: engine
2013-05-07 11:18:13 -07:00
Jérôme Petazzoni
443030ccf1
implement "-c" option to allocate a number of CPU shares to a container
...
Upstream-commit: efd9becb78c82ddef07efb7e76e0100d7a712281
Component: engine
2013-05-07 11:16:30 -07:00
unclejack
e188ef45f3
kernel version - don't show the dash if flavor is empty
...
Upstream-commit: d2eb2455a1fc379dbac94d651b0785b631b84add
Component: engine
2013-05-07 20:57:21 +03:00
Guillaume J. Charmes
11e30ef978
Merge pull request #543 from dotcloud/pull-official-tag-fix
...
- Registry: Fix pull for official images with specific tag
Upstream-commit: a2b5196061bf7fd174c52fce2e245c85a1506c45
Component: engine
2013-05-07 10:56:37 -07:00
Ken Cochrane
4ab4386507
Merge pull request #544 from DanielVF/master
...
- Documentation: Fixed CouchDB example page header mistake
Upstream-commit: f46ab22b7a15f2bd974029819e487577d9593141
Component: engine
2013-05-07 10:51:35 -07:00
Ken Cochrane
9b78bae37f
Merge pull request #535 from dhrp/website_update
...
* Documentation: updated www.docker.io website.
Upstream-commit: 074310063de4fb48206afe2fc6f75cb08a298244
Component: engine
2013-05-07 10:45:29 -07:00
Guillaume J. Charmes
2d972eaadd
Merge pull request #542 from dotcloud/docker-search
...
+ Registry: Add docker search top level command in order to search a repository
Upstream-commit: 01575e1f6775d7874876b271ef573a865f4608eb
Component: engine
2013-05-07 10:43:19 -07:00
Victor Vieux
b385a1ce2f
Merge branch 'master' into remote-api
...
Upstream-commit: 97fdfab44692f76dd48353c261f1e2ba9b85b41f
Component: engine
2013-05-07 19:42:36 +02:00
shin-
918b8e4e00
Added actual doc file
...
Upstream-commit: 82513815f1d2bee77ae729b4293e29d6377ab03d
Component: engine
2013-05-07 10:31:55 -07:00
shin-
fdf1b6eb16
Added doc page for new search command
...
Upstream-commit: 4df26b9ee74c9d381447a10f9eae5db1ab1872c8
Component: engine
2013-05-07 10:29:49 -07:00
Victor Vieux
44910e43b1
update to master
...
Upstream-commit: 10c0e990371e065d4fc1c9b680f03a46e5bacc5e
Component: engine
2013-05-07 19:23:50 +02:00
Ken Cochrane
a42d7ca0b1
Merge pull request #546 from shamrin/patch-3
...
- Documentation: fixed README formatting
Upstream-commit: fc2df7e634cd51c2ecf5e3d66ece1d1005735579
Component: engine
2013-05-07 10:01:16 -07:00
Victor Vieux
9ac8f0a7fc
first draft of the doc, split commit and fix some issues in spi.go
...
Upstream-commit: 0b6c79b303547e38c758c16da2db1a430296953e
Component: engine
2013-05-07 17:19:41 +02:00
Alexey Shamrin
d13c0d0550
README: fix Markdown formatting
...
Upstream-commit: c718eb282b2d0d9479e566f1d8c3dd856eee8334
Component: engine
2013-05-07 17:57:26 +04:00
Daniel Von Fange
ce106440a9
CouchDB example page was titled redis
...
Upstream-commit: 0a13ce9befa57c45941b01cf71675e87d878fca4
Component: engine
2013-05-07 08:33:29 -04:00
Joffrey F
d46e47300a
Fixes bug when pulling an official image (no user namespace) with a specified tag
...
Upstream-commit: 0a197f9b4fe5f63abf60a17b8d595dd72b7eb471
Component: engine
2013-05-07 04:54:58 -07:00
shin-
4eb7aea0d0
missing comma
...
Upstream-commit: 3d25e09c3b572a7f060e4e7ad0f3b4a2f191e9de
Component: engine
2013-05-07 03:54:31 -07:00
shin-
4d3a8d7c57
Implemented command
...
Upstream-commit: d56c5406acb3f48ee338a8e4007be7c135074779
Component: engine
2013-05-07 03:49:08 -07:00
Nate Jones
d59572be9d
fix ByParent
...
Upstream-commit: 23c5c130148985e3e527fa799beb45326ac791a9
Component: engine
2013-05-06 21:31:59 -07:00
Guillaume J. Charmes
71ceced6ad
Merge pull request #523 from steakknife/522-docker-build
...
* Builder: use any whitespaces instead of tabs
Upstream-commit: 6ac33eb64936e16769ea6e6efb57c0bd98bc7aeb
Component: engine
2013-05-06 19:06:11 -07:00
Guillaume J. Charmes
4d2716f094
Merge pull request #537 from dotcloud/builder-env
...
+ Builder: Implement ENV within docker builder
Upstream-commit: a02ad8c896da3be4c3aeb687111e9e823562de63
Component: engine
2013-05-06 18:57:15 -07:00
Guillaume J. Charmes
0d4addc80f
Add the ENV instruciton to the docker builder documentation
...
Upstream-commit: 4c7c177e4ea4a166e656306e1d845cdb9e2f37ce
Component: engine
2013-05-06 18:54:27 -07:00
Guillaume J. Charmes
ec2fdcee5d
Implement ENV within docker builder
...
Upstream-commit: e45aef0c82044be6a427502d4bbb0979074c2ba1
Component: engine
2013-05-06 18:39:56 -07:00
Guillaume J. Charmes
1fe09c7f12
Merge pull request #497 from justone/dot-graph-images
...
+ images: output graph of images to dot (graphviz)
Upstream-commit: 8472a27e80849318161ed7d8f30a8b431b1571a8
Component: engine
2013-05-06 17:48:07 -07:00
Thatcher Peskens
6ebdfb5b76
Updated index to reflect new (short) 'engine' message (merged with solomon's new text), also moved around the layout a bit and fixed some small text errors.
...
Upstream-commit: 0d929d13d360bbcbb2e524d44253a5f405cd041f
Component: engine
2013-05-06 17:41:51 -07:00
Guillaume J. Charmes
ffe8839b32
Merge pull request #534 from dotcloud/510-update-go
...
* Packaging: packaging ubuntu; issue #510 : Use goland-stable PPA package to build docker
Upstream-commit: a0d80ed3e6bfe18692dfb15ed47050a8b7de2523
Component: engine
2013-05-06 17:27:02 -07:00
Guillaume J. Charmes
3f1d7b975a
Merge pull request #532 from dotcloud/login_cookie_fix
...
- Registry: Fix issue when login in with a different user and trying to push
Upstream-commit: e8853ec3a4f8e194a7324a8b4fcfb95217d00ab2
Component: engine
2013-05-06 17:23:57 -07:00
Guillaume J. Charmes
b16f3020d5
Merge pull request #512 from dotcloud/builder-doc
...
+ Documentation: Add the documentation for docker builder
Upstream-commit: 8ea9811089bf0a6615ed562ab86a9ac8ff6d2ab7
Component: engine
2013-05-06 17:22:35 -07:00
Guillaume J. Charmes
bdc049bfe2
Merge pull request #504 from dotcloud/builder-autorun
...
+ Builder: Implement the autorun capability within docker builder
Upstream-commit: f3f2cba386df283851fd48056c97f6f45477385c
Component: engine
2013-05-06 17:21:31 -07:00
Guillaume J. Charmes
7d3cfe8bfc
Merge pull request #511 from dotcloud/builder-cache
...
+ Builder: Add caching to docker builder
Upstream-commit: d581f0808c960b97a156f82ad7c4a78aa3b6d6f0
Component: engine
2013-05-06 17:20:22 -07:00
Guillaume J. Charmes
b29dc2f380
Merge pull request #472 from dotcloud/builder
...
+ Builder: Add support for docker builder with native API as top level command
Upstream-commit: ce4e87196f77e2aaace9c246f00fbf3cce90e642
Component: engine
2013-05-06 17:18:56 -07:00
Guillaume J. Charmes
c74948a937
Rebase fix
...
Upstream-commit: 7757be1f452c625d26d1b086384003ab6131e6d4
Component: engine
2013-05-06 17:12:56 -07:00