1
0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Commit Graph

2587 Commits

Author SHA1 Message Date
Nolan
8a3b7335fe Add hostname to the container environment.
Upstream-commit: 05219d6b52d8448fdad72f89b192d61480483aff
Component: engine
2013-08-13 17:30:21 +00:00
Michael Crosby
7847f341c4 Bump to 0.5.3
Upstream-commit: c3773740d982d62c5c478d3fb27aa4494383b11b
Component: engine
2013-08-12 23:55:42 +00:00
Steeve Morin
cc86282cc7 Handle ip route showing mask-less IP addresses
Sometimes `ip route` will show mask-less IPs, so net.ParseCIDR will fail. If it does we check if we can net.ParseIP, and fail only if we can't.
Fixes #1214
Fixes #362
Upstream-commit: 0ca133dd7681bb3af1d1de18a5ea6ed42142a11e
Component: engine
2013-08-12 23:46:26 +00:00
Guillaume J. Charmes
8e0a4e36d7 Make sure ENV instruction within build perform a commit each time
Upstream-commit: 68934878f1e707b126ab754d48ff6c6eb858b37e
Component: engine
2013-08-12 23:43:53 +00:00
Michael Crosby
daa3c2ba78 Revert "docker.upstart: avoid spawning a sh process"
This reverts commit 24dd50490a027f01ea086eb90663d53348fa770e.
Upstream-commit: ef1d1aefa73f71296911b0f5593e46a81c1f5c55
Component: engine
2013-08-12 23:35:23 +00:00
Daniel Mizyrycki
bd75d9f136 API, issue 1471: Allow users belonging to the docker group to use the docker client
Upstream-commit: c015d26e96e1f6ebee2a577468c747bf3d2aeeb9
Component: engine
2013-08-12 23:33:42 +00:00
Michael Crosby
99970249be Merge pull request #1464 from dotcloud/bump_0.5.2
Bump to 0.5.2
Upstream-commit: 1643943402fdbce021db51b0f4f49edb0fa2e285
Component: engine
2013-08-08 17:36:53 -07:00
Michael Crosby
c3b5f3b391 Bump to v0.5.2
Upstream-commit: e99a99eb6ee7257c0b11312bec33fe27cffdaaaa
Component: engine
2013-08-09 00:17:35 +00:00
Michael Crosby
d9f7dc6f82 Change daemon to listen on unix socket by default
Conflicts:
	docs/sources/api/docker_remote_api.rst
Upstream-commit: df9712f1c8039f83497e3c647788dd697f034158
Component: engine
2013-08-09 00:16:43 +00:00
Jérôme Petazzoni
ee3c1a6db9 change network range to avoid conflict with EC2 DNS
Upstream-commit: 5c56b597a9f6d910ee1f22da42f8b9e5d18c678a
Component: engine
2013-08-08 23:27:55 +00:00
Michael Crosby
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
Michael Crosby
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
Guillaume J. Charmes
e1c384f8da Bump to v0.5.1
Upstream-commit: 3b89d13aaf76cd363d62955c050675ccd68a7296
Component: engine
2013-07-31 10:53:36 -07:00
Victor Vieux
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
Victor Vieux
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
Victor Vieux
d8352677c8 Merge branch 'master' into 1237-improve_docker_top-feature
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
Victor Vieux
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
Victor Vieux
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
Victor Vieux
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
Victor Vieux
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
dsissitka
86d430ea32 Fixed a couple of minor syntax errors.
Upstream-commit: 9ba998312de5826f24f693c8518ecda700135b4b
Component: engine
2013-07-30 01:39:29 -04:00
Daniel Mizyrycki
54cdb0b99a Merge pull request #1209 from zimbatm/upstart-improvements
Upstart improvements
Upstream-commit: 7d68afb2d28b59757b953446c1c6a0df3c2174ec
Component: engine
2013-07-29 18:28:40 -07:00
Daniel Mizyrycki
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
Thatcher Peskens
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
Guillaume J. Charmes
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
David Calavera
4dd9531b17 Keep the loop to allow resizing more than once.
Upstream-commit: 10e37198aa14cb3192fd0bf29572a5dce58c348f
Component: engine
2013-07-29 11:13:59 -07:00
Guillaume J. Charmes
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
David Calavera
4b37d9ec34 Remove unnecessary signal conditional.
Upstream-commit: c8ec36d1b9bfbe1e22acd0124409ecb5a109d406
Component: engine
2013-07-29 10:28:41 -07:00
Solomon Hykes
730b8810f9 Remove deprecated copy from README
Upstream-commit: 97a2dc96f23b25bc7980d2a4514b7065ff4edb9e
Component: engine
2013-07-28 12:57:09 -07:00
David Calavera
86b74909af Remove unused argument.
Upstream-commit: 88b6ea993d76fb8891ee7a7fa8828b5c5753c7f5
Component: engine
2013-07-27 10:17:57 -07:00
David Calavera
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
Guillaume J. Charmes
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
Mike Gaffney
3fa2b3c80a Add required go version for compilation
Upstream-commit: 2d85a20c71c9418301c3161c6853a07fca612676
Component: engine
2013-07-26 18:29:27 -07:00
Guillaume J. Charmes
afb8e86b7c Merge pull request #1313 from titanous/update-authors
Update AUTHORS
Upstream-commit: c01d17d77dfccdb8bd04f50489cba181c33162c2
Component: engine
2013-07-26 17:04:05 -07:00
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Jonathan Rudenberg
cd3a1b4855 Update AUTHORS
Upstream-commit: 5eb590e79d081ecfa82ba940ea856c4a2c0411ca
Component: engine
2013-07-26 15:48:01 -04:00
Jonathan Rudenberg
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
Solomon Hykes
d391806121 Clean up 'manifesto' in docs
Upstream-commit: a97d858b2a0d6bc4d044a241036b97fd78f93022
Component: engine
2013-07-26 10:21:17 -07:00
Victor Vieux
cdbe046a76 add regression test
Upstream-commit: e592f1b298c778d0b9adfd6751f5fe1843a7001d
Component: engine
2013-07-26 10:30:36 +00:00
Victor Vieux
71ca6b4378 fix docs
Upstream-commit: 513a5674831fd952fc8e7b8fbdbc4939393ecb5b
Component: engine
2013-07-26 10:04:46 +00:00
Victor Vieux
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
Victor Vieux
8f7401af36 fix wrong untag when using rmi via id
Upstream-commit: e608296bc62ceeaf41ebf2bc80b21c0a1883d4f0
Component: engine
2013-07-26 09:19:26 +00:00
Mike Gaffney
4118c3f059 Change reserve-compatibility to reverse-compatibility
Upstream-commit: 4ebe2cf348915415c34503aca7a5663177e0002f
Component: engine
2013-07-26 01:10:42 -07:00
Andy Rothfusz
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
Guillaume J. Charmes
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
Fareed Dudhia
7c51899dd5 Fixes 1136; Reopened from 1175 with latest changes.
Upstream-commit: d86898b0142f2f9a834aa0c727b10d62ef647262
Component: engine
2013-07-25 19:45:49 +00:00
Guillaume J. Charmes
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
Guillaume J. Charmes
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