da0dfa9ebd
Move note about officially supported kernel
...
It seems this a general note about kernel issues and not specific to Cgroups or namespaces.
Upstream-commit: 2424480e2ce14d848c041c53cc041aab91308081
Component: engine
2013-08-02 12:24:38 +07:00
a4aa2bc965
Merge pull request #1333 from dotcloud/1331-testing-registry
...
testing, issue #1331 : Add registry functional test to docker-ci
Upstream-commit: ea2486d6316b005eb55f8784acfdfd94ed7aba63
Component: engine
2013-08-01 16:00:29 -07:00
0023e3413a
Merge pull request #1365 from dhrp/solve-logo-squish
...
Solved the logo being squished in Safari
Upstream-commit: d1e1a8e78cf7a315bd3083d120220a96663fe5ff
Component: engine
2013-07-31 15:06:26 -07:00
d69f94df65
Solved the logo being squished in Safari
...
Upstream-commit: e0c24ccfc37b64eb919c5675d8a8f383201fa7cb
Component: engine
2013-07-31 12:17:42 -07:00
5eea0cead3
Merge pull request #1328 from dotcloud/1307_url_port_delete-fix
...
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
Upstream-commit: 0c0077ed6f044f83fff75f2d7a696491fb7fe360
Component: engine
2013-07-31 07:55:06 -07:00
18178e0bee
Merge pull request #1334 from dotcloud/1314-compat_broke-fix
...
Discard error when loading old container format
Upstream-commit: cd9f7f29d135d0ebe32214696f7bfe2139698a6d
Component: engine
2013-07-31 01:08:08 -07:00
496b0008be
fix same issue in api.go
...
Upstream-commit: a7068510a5ee4af6776221ba00bc332266f97088
Component: engine
2013-07-31 08:01:20 +00:00
e5429eecea
improve tests
...
Upstream-commit: 73c6d9f135493220f034d440d26fedc0242e133a
Component: engine
2013-07-31 07:56:53 +00:00
ff2d49a2f6
Merge pull request #1344 from dotcloud/refactor_checksum_tests
...
fix tests about refactor checksums
Upstream-commit: d5a57a4b5ee7bb722371d92c173c95d10b6667c5
Component: engine
2013-07-30 06:13:49 -07:00
6c28901fdb
fix tests about refactor checksums
...
Upstream-commit: b14c251862021b2bc82aa8e0146e5e5e80f1c713
Component: engine
2013-07-30 13:13:18 +00:00
eac2c76be1
Merge pull request #1268 from dotcloud/refactor_checksum
...
Refactor checksum
Upstream-commit: bcd6ca368556c329063d58c32945753f783adc75
Component: engine
2013-07-30 06:07:54 -07:00
19f5597185
Merge pull request #1291 from dotcloud/ensure_mount_commit
...
*Builder: Allow the commit of a non-started container
Upstream-commit: 16225c473f2c999ce3e9a13c4c8e02502a9a841c
Component: engine
2013-07-30 05:19:17 -07:00
6f9ace1891
Merge pull request #1238 from dotcloud/1237-improve_docker_top-feature
...
*Client: add ps args to docker top
Upstream-commit: dd2f0d89bfebdc85723e0aa61f017cc2a9fd8bbf
Component: engine
2013-07-30 04:54:44 -07:00
d8352677c8
Merge branch 'master' into 1237-improve_docker_top-feature
...
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
091d56f759
Merge pull request #1342 from dsissitka/patch-4
...
Fixed a couple of minor syntax errors.
Upstream-commit: f2dc49292f775f4c10fc61157cac0b8e15315917
Component: engine
2013-07-30 04:20:05 -07:00
b5c161efba
Merge pull request #1339 from dhrp/docker-run-d-description
...
Updated the description of run -d
Upstream-commit: a7ace535c36905b85af3cc3f57beb910ed9efb32
Component: engine
2013-07-30 04:15:41 -07:00
915bf69673
Merge branch 'cleanup_signal_handling' of https://github.com/calavera/docker into calavera-cleanup_signal_handling
...
Upstream-commit: c99e8de5a4faeb6c3d696790cc300a88f8e96855
Component: engine
2013-07-30 11:14:36 +00:00
5b5037b593
Merge pull request #1306 from dotcloud/1294_fix_wrong_untag_using_id_rmi
...
Fix wrong untag using id rmi
Upstream-commit: c06aa62bdaa92df5c58d0ca5deb54b1ca66f3ba5
Component: engine
2013-07-30 04:09:55 -07:00
86d430ea32
Fixed a couple of minor syntax errors.
...
Upstream-commit: 9ba998312de5826f24f693c8518ecda700135b4b
Component: engine
2013-07-30 01:39:29 -04:00
54cdb0b99a
Merge pull request #1209 from zimbatm/upstart-improvements
...
Upstart improvements
Upstream-commit: 7d68afb2d28b59757b953446c1c6a0df3c2174ec
Component: engine
2013-07-29 18:28:40 -07:00
ac3069fde6
Merge pull request #1312 from titanous/vagrant-bind
...
Bind daemon to 0.0.0.0 in Vagrant
Upstream-commit: bfdf1839e07c0dfb54f5258ede0ccb94a16f4d08
Component: engine
2013-07-29 17:06:37 -07:00
7e99f4ac78
Updated the description of run -d
...
The goal is to make it more clear this will give you the container id after run completes.
Since stdout is now standard on run, "docker run -d" is the best (or only) way to get the container ID returned from docker after a plain run, but the description (help) does not hint any such thing.
Upstream-commit: 5dc86d7bca17c2996264a18cc26f06d30e532588
Component: engine
2013-07-29 14:17:15 -07:00
0864f56735
Merge pull request #1233 from fmd/1136-environment-variables
...
+ Builder: CmdAdd and CmdEnv now respect Dockerfile-set ENV variables
Upstream-commit: f35491190a91fb078cb1e5b3319434a6acfa024e
Component: engine
2013-07-29 13:43:13 -07:00
753746a54d
Make sure the index also receives the checksums
...
Upstream-commit: 5b27652ac6eaf1bc4c2a16e51919ec4272a58fd6
Component: engine
2013-07-29 11:30:21 -07:00
0e6bb26f77
Switch json/payload order
...
Upstream-commit: 394941b6b0a30fecf8ae7b6de5880fa553141f93
Component: engine
2013-07-29 11:30:17 -07:00
c364da0b51
Remove unused parameter
...
Upstream-commit: 0f134b4bf81a4d0160932852854b190b7ee7e3b9
Component: engine
2013-07-29 11:30:17 -07:00
78c57a64f0
Refactor the image size storage
...
Upstream-commit: 0badda9f1587c11a13dca17c68b30addd757237c
Component: engine
2013-07-29 11:30:17 -07:00
0d6f4c9ed4
Handle extra-paremeter within checksum calculations
...
Upstream-commit: e3f68b22d8f0635a8c08ab56721e56dbe570a49a
Component: engine
2013-07-29 11:30:17 -07:00
e9895c9839
Refactor checksum
...
Upstream-commit: 8ca7b0646e6c4346075656f46847f53c2e868a3d
Component: engine
2013-07-29 11:30:17 -07:00
4dd9531b17
Keep the loop to allow resizing more than once.
...
Upstream-commit: 10e37198aa14cb3192fd0bf29572a5dce58c348f
Component: engine
2013-07-29 11:13:59 -07:00
dc5c754547
Merge pull request #1322 from calavera/prompt_without_defaults
...
Do not show empty parenthesis if the default configuration is missing.
Upstream-commit: 950d0312dccde9826ea1e4c26dafab0dc56a59bb
Component: engine
2013-07-29 10:53:43 -07:00
4b37d9ec34
Remove unnecessary signal conditional.
...
Upstream-commit: c8ec36d1b9bfbe1e22acd0124409ecb5a109d406
Component: engine
2013-07-29 10:28:41 -07:00
1ccfbf8698
testing, issue #1331 : Add registry functional test to docker-ci
...
Upstream-commit: 17ffb0ac84874656a61a477fa29048cb82b28748
Component: engine
2013-07-29 09:45:19 -07:00
224e45118c
fix #1314 discard error when loading old container format
...
Upstream-commit: b2aa877bf0a3f140516d1c17117369b2194f2b91
Component: engine
2013-07-29 16:40:35 +00:00
c1c0668f04
add regression tests
...
Upstream-commit: bb241c10e2f124406f00c8e40e00fca67934638a
Component: engine
2013-07-29 12:16:14 +00:00
77e59c2148
add ParseRepositoryTag tests
...
Upstream-commit: 3852d0599097581d5dc0bcfcb7aa010d564beb9a
Component: engine
2013-07-29 12:16:01 +00:00
183aa3c2d9
use ParseRepositoryTag instead on split on : in imagedelete
...
Upstream-commit: 63876e7dbdd372745855345632af62b8cd976dfa
Component: engine
2013-07-29 12:15:27 +00:00
730b8810f9
Remove deprecated copy from README
...
Upstream-commit: 97a2dc96f23b25bc7980d2a4514b7065ff4edb9e
Component: engine
2013-07-28 12:57:09 -07:00
86b74909af
Remove unused argument.
...
Upstream-commit: 88b6ea993d76fb8891ee7a7fa8828b5c5753c7f5
Component: engine
2013-07-27 10:17:57 -07:00
fba18c65a3
Do not show empty parenthesis if the default configuration is missing.
...
Upstream-commit: d4f70397930b15c8860a71df1abb9bc5ac9ab4ff
Component: engine
2013-07-27 10:00:36 -07:00
20ba886be3
Merge pull request #1318 from gaffo/compile_docs
...
Add required go version for compilation
Upstream-commit: 4399f65fb88ffd1f98be4eb630cda242f84f4254
Component: engine
2013-07-26 18:33:10 -07:00
3fa2b3c80a
Add required go version for compilation
...
Upstream-commit: 2d85a20c71c9418301c3161c6853a07fca612676
Component: engine
2013-07-26 18:29:27 -07:00
afb8e86b7c
Merge pull request #1313 from titanous/update-authors
...
Update AUTHORS
Upstream-commit: c01d17d77dfccdb8bd04f50489cba181c33162c2
Component: engine
2013-07-26 17:04:05 -07:00
60813cce72
Merge pull request #1316 from dotcloud/1295-mkdir_ADD_issue
...
- Builder: Create directories with 755 instead of 700 within ADD instruction
Upstream-commit: ed0ba04da6a33d9327725813a325084d1c2491de
Component: engine
2013-07-26 15:12:45 -07:00
bdd8af7919
- Builder: Create directories with 755 instead of 700 within ADD instruction
...
Upstream-commit: b15cfd3530cc228dc065746c9323758c8abb0481
Component: engine
2013-07-26 14:57:16 -07:00
068799c1af
Merge pull request #1272 from dotcloud/improve_registry_cookie
...
Make sure the cookie is used in all registry queries
Upstream-commit: a438d505ba6107abf5490f74f15de3fdafb81b86
Component: engine
2013-07-26 14:26:29 -07:00
cd3a1b4855
Update AUTHORS
...
Upstream-commit: 5eb590e79d081ecfa82ba940ea856c4a2c0411ca
Component: engine
2013-07-26 15:48:01 -04:00
b0bd5c4e73
Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304
...
Upstream-commit: bdc79ac8b2dfad302f9e144711067a566726cfa2
Component: engine
2013-07-26 15:45:00 -04:00
d391806121
Clean up 'manifesto' in docs
...
Upstream-commit: a97d858b2a0d6bc4d044a241036b97fd78f93022
Component: engine
2013-07-26 10:21:17 -07:00
cdbe046a76
add regression test
...
Upstream-commit: e592f1b298c778d0b9adfd6751f5fe1843a7001d
Component: engine
2013-07-26 10:30:36 +00:00
