f68b60ff71
Forbid certain paths within docker build ADD
...
Conflicts:
buildfile_test.go
Upstream-commit: f712e10cb21d0056593ea23152d347637396c810
Component: engine
2013-08-08 23:22:14 +00:00
c70bce9196
Merge pull request #1364 from dotcloud/bump_0.5.1
...
Bump to v0.5.1
Upstream-commit: 8a851af5e60ef5807aa5e6a984461b0e3cc6bd0e
Component: engine
2013-08-05 12:10:03 -07:00
e1c384f8da
Bump to v0.5.1
...
Upstream-commit: 3b89d13aaf76cd363d62955c050675ccd68a7296
Component: engine
2013-07-31 10:53:36 -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
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
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
71ca6b4378
fix docs
...
Upstream-commit: 513a5674831fd952fc8e7b8fbdbc4939393ecb5b
Component: engine
2013-07-26 10:04:46 +00:00
e145df42f9
Merge pull request #1305 from gaffo/fix-spelling
...
Change reserve-compatibility to reverse-compatibility
Upstream-commit: faf103e6ec8ee07637c002fd9e0b8d0caf11ec1d
Component: engine
2013-07-26 02:40:56 -07:00
8f7401af36
fix wrong untag when using rmi via id
...
Upstream-commit: e608296bc62ceeaf41ebf2bc80b21c0a1883d4f0
Component: engine
2013-07-26 09:19:26 +00:00
4118c3f059
Change reserve-compatibility to reverse-compatibility
...
Upstream-commit: 4ebe2cf348915415c34503aca7a5663177e0002f
Component: engine
2013-07-26 01:10:42 -07:00
41fd022aa4
Merge pull request #1274 from dhrp/headings_website
...
Removed website and updated headings.
Upstream-commit: 422378cb85b1a158373ea8e5a2dc2de92076d225
Component: engine
2013-07-25 16:43:27 -07:00
e53564ccbf
Merge pull request #1281 from dotcloud/505-output_after_pipe-fix
...
- Runtime: Fixes #505 - Make sure all output is send on the network before closing
Upstream-commit: 594c818d853a18014711fb0b95c9ffd3954c56c7
Component: engine
2013-07-25 13:01:31 -07:00
7c51899dd5
Fixes 1136; Reopened from 1175 with latest changes.
...
Upstream-commit: d86898b0142f2f9a834aa0c727b10d62ef647262
Component: engine
2013-07-25 19:45:49 +00:00
2d7b015e94
Merge pull request #1293 from dotcloud/585_use_0755_instead_of_0700
...
use 0755 instead of 0700
Upstream-commit: be087c9c82ae905ec23a327b0199c6bf574ab5a9
Component: engine
2013-07-25 12:40:44 -07:00
8ad99ad99c
Merge pull request #1288 from dlintw/1286-improve-import-txz-description
...
Fixes #1286 improve-import-txz-description
Upstream-commit: 9cc8b72a38491efbaf86f3d13689bc13ef74d32d
Component: engine
2013-07-25 12:37:37 -07:00
795426f1f2
Make sure the cookie is used in all registry queries
...
Upstream-commit: 3425c1b84c3f58ac5bb2feb91c4901b61561c58c
Component: engine
2013-07-25 12:31:23 -07:00
15664f4161
use 0755 instead of 0700
...
Upstream-commit: 1c509f4350d943c6aa8b9bff8dcbed28ee803735
Component: engine
2013-07-25 15:45:15 +00:00
85f64e1df7
add regression test + go fmt
...
Upstream-commit: 48833c7b0784bc7055f29dd3448df3af93c462ec
Component: engine
2013-07-25 15:20:56 +00:00
2cfc902d29
ensure mount in commit
...
Upstream-commit: f385f1860bdebe2434bb122bd5ac8fec85687970
Component: engine
2013-07-25 15:18:34 +00:00
f3125e247a
Merge pull request #1283 from crosbymichael/username-not-set
...
Copy authConfigs on save so data is not modified
Upstream-commit: 7df6c4b9adaa64d243312f37ed2a6dbe6c897282
Component: engine
2013-07-25 06:31:34 -07:00
c0c3fbc7b6
Fixes #1286
...
Upstream-commit: 8f6b6d57840410d1491321d7681ef2a946e90bc9
Component: engine
2013-07-25 15:36:32 +08:00
e6f304a5c6
Add regression test for authConfig overwrite
...
Upstream-commit: 0fc11699ab26121e4f89808ffacb2becf536ff5d
Component: engine
2013-07-25 03:25:16 +00:00
164f76762a
Copy authConfigs on save so data is not modified
...
SaveConfig sets the Username and Password to an empty string
on save. A copy of the authConfigs need to be made so that the
in memory data is not modified.
Upstream-commit: 9332c00ca562e97045490d3d45d8f805fae30330
Component: engine
2013-07-25 00:35:52 +00:00
4350e3145d
Fixes #505 - Make sure all output is send on the network before closing
...
Upstream-commit: fd9ad1a19469d07944ca9b417861d63ecec2ef42
Component: engine
2013-07-24 15:48:51 -07:00
7907b8ec17
Merge pull request #1277 from dotcloud/add_commands_unit_tests
...
* Tests: Reimplement old Commands unit tests in order to insure behavior
Upstream-commit: 6ae3305040346083c4b17997e706e7b364c33910
Component: engine
2013-07-24 15:24:51 -07:00
