Commit Graph

20395 Commits

Author SHA1 Message Date
2a0cf81ee6 fix run no parameter
Upstream-commit: 40794113750a3d21e784e2521ae517f23a081135
Component: engine
2013-05-07 20:59:04 +02:00
84ab689e05 propagate CpuShares in mergeConfig
Upstream-commit: eef8b0d406412ffe6622ed1f2c858540eb7f75f1
Component: engine
2013-05-07 11:44:38 -07:00
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
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
521aa8b1ce added search
Upstream-commit: 59a6316f5e0810009f5986d62f1707f8d0a6650e
Component: engine
2013-05-07 20:43:31 +02:00
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
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
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
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
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
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
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
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
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
b385a1ce2f Merge branch 'master' into remote-api
Upstream-commit: 97fdfab44692f76dd48353c261f1e2ba9b85b41f
Component: engine
2013-05-07 19:42:36 +02:00
918b8e4e00 Added actual doc file
Upstream-commit: 82513815f1d2bee77ae729b4293e29d6377ab03d
Component: engine
2013-05-07 10:31:55 -07:00
fdf1b6eb16 Added doc page for new search command
Upstream-commit: 4df26b9ee74c9d381447a10f9eae5db1ab1872c8
Component: engine
2013-05-07 10:29:49 -07:00
44910e43b1 update to master
Upstream-commit: 10c0e990371e065d4fc1c9b680f03a46e5bacc5e
Component: engine
2013-05-07 19:23:50 +02:00
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
d13c0d0550 README: fix Markdown formatting
Upstream-commit: c718eb282b2d0d9479e566f1d8c3dd856eee8334
Component: engine
2013-05-07 17:57:26 +04:00
ce106440a9 CouchDB example page was titled redis
Upstream-commit: 0a13ce9befa57c45941b01cf71675e87d878fca4
Component: engine
2013-05-07 08:33:29 -04:00
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
4eb7aea0d0 missing comma
Upstream-commit: 3d25e09c3b572a7f060e4e7ad0f3b4a2f191e9de
Component: engine
2013-05-07 03:54:31 -07:00
4d3a8d7c57 Implemented command
Upstream-commit: d56c5406acb3f48ee338a8e4007be7c135074779
Component: engine
2013-05-07 03:49:08 -07:00
d59572be9d fix ByParent
Upstream-commit: 23c5c130148985e3e527fa799beb45326ac791a9
Component: engine
2013-05-06 21:31:59 -07:00
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
0d4addc80f Add the ENV instruciton to the docker builder documentation
Upstream-commit: 4c7c177e4ea4a166e656306e1d845cdb9e2f37ce
Component: engine
2013-05-06 18:54:27 -07:00
ec2fdcee5d Implement ENV within docker builder
Upstream-commit: e45aef0c82044be6a427502d4bbb0979074c2ba1
Component: engine
2013-05-06 18:39:56 -07:00
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
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
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
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
c74948a937 Rebase fix
Upstream-commit: 7757be1f452c625d26d1b086384003ab6131e6d4
Component: engine
2013-05-06 17:12:56 -07:00
8dc41b9fbc Update docker builder doc
Upstream-commit: 49b05eb24a3281a8d57791b09f5b82f7dafc87f8
Component: engine
2013-05-06 17:10:42 -07:00
7d7814dc83 Moving runtime.Create to builder.Create
Upstream-commit: dae2828957b6b962109a9f7ad061e9ddd90b8833
Component: engine
2013-05-06 17:09:58 -07:00
d00bfd7982 Rebase fix
Upstream-commit: 3439cd9cea8056cce62d46dd5cf59d6d5b50ef84
Component: engine
2013-05-06 17:07:56 -07:00
8112d65cfb Fix typo in builder
Upstream-commit: 979db00d9af4741572ece9c67061526d5d4a6616
Component: engine
2013-05-06 17:01:59 -07:00
1fa62362e8 Implement the CMD instruction in order to allow autorun
Upstream-commit: db4417b601feedb03cc70b79f64456e817ce0c05
Component: engine
2013-05-06 17:01:59 -07:00
6aedcc2420 Allow to stack multiple EXPOSE instructions
Upstream-commit: a64ebe5feb84d65adbc23ee9d2119f5eab836079
Component: engine
2013-05-06 17:01:59 -07:00
d43649a37e Moving runtime.Create to builder.Create
Upstream-commit: 602786cd60746cd2baf7bb14fb6acb60f9554f50
Component: engine
2013-05-06 17:00:51 -07:00
4d47ca713e Rebase fix
Upstream-commit: 35c59f4e05fb8dc3a5939d6af8c9313ebda6a5dd
Component: engine
2013-05-06 16:58:09 -07:00
7b44115892 Add compatibility with contrib builder
Upstream-commit: 756df27e45f2e5d9033058f60afa9547239af1d6
Component: engine
2013-05-06 16:44:37 -07:00
7230640e35 Implement caching for docker builder
Upstream-commit: a46fc3a59e585e005ec67b05211ca9de02f0c4ff
Component: engine
2013-05-06 16:44:37 -07:00
99d46ab38a Rebase master (autorun)
Upstream-commit: 9959e2cd637d09e8c37891cebcb1764c825ef7d5
Component: engine
2013-05-06 16:44:37 -07:00
8358eede2f Moving runtime.Create to builder.Create
Upstream-commit: f911ccc27bcbcf281a0d690c5d7b05709c8947d4
Component: engine
2013-05-06 16:44:37 -07:00
f2bd4a9977 Add build command
Upstream-commit: 96069de4e0818f9d513f6ea495e03d8e67eb1e98
Component: engine
2013-05-06 16:44:37 -07:00
55ee516efc Fix merge issue
Upstream-commit: d92166cc7937afa39e2ed537c601555a0a5b84eb
Component: engine
2013-05-06 16:43:50 -07:00
cfceadcb2c Remove the open from CmdBuild
Upstream-commit: ebb59c1125d194716f26b8cc53863fa9910c4b3f
Component: engine
2013-05-06 16:42:54 -07:00
e1a5574c37 Add build command
Upstream-commit: e2880950c5ea721be00a814d93ea256feb9f98bb
Component: engine
2013-05-06 16:42:53 -07:00
3fba3bc835 Make the autopull compatible with new registry
Upstream-commit: 62a1850c16180ac83418e044e315ba8776f6a651
Component: engine
2013-05-06 16:40:45 -07:00