1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

2532 Commits

Author SHA1 Message Date
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
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
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
Victor Vieux
15664f4161 use 0755 instead of 0700
Upstream-commit: 1c509f4350d943c6aa8b9bff8dcbed28ee803735
Component: engine
2013-07-25 15:45:15 +00:00
Victor Vieux
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
Daniel YC Lin
c0c3fbc7b6 Fixes #1286
Upstream-commit: 8f6b6d57840410d1491321d7681ef2a946e90bc9
Component: engine
2013-07-25 15:36:32 +08:00
Michael Crosby
e6f304a5c6 Add regression test for authConfig overwrite
Upstream-commit: 0fc11699ab26121e4f89808ffacb2becf536ff5d
Component: engine
2013-07-25 03:25:16 +00:00
Michael Crosby
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Andy Rothfusz
8d0a63a363 Merge pull request #1278 from metalivedev/logotweaks
Cleaned up long lines, switched graphic to Docker logo. General cleanup.
Upstream-commit: cc0e091a6bf867d0eccd0c0de93ff759e465f657
Component: engine
2013-07-24 10:37:45 -07:00
Victor Vieux
5d6f4f6624 Merge pull request #1243 from dotcloud/add_lxc_version_docker_info
*Client: LXC and Kernel version to docker info in debug mode
Upstream-commit: dfc076a123d4792444f980e294b2d82ab928e888
Component: engine
2013-07-24 07:44:23 -07:00
Victor Vieux
94cce8e9a8 Merge pull request #1064 from monnand/156-user-agent-header
Add user agent when calling the registry
Upstream-commit: f6e1055727877a255418513c4ffc3271bf214530
Component: engine
2013-07-24 06:40:53 -07:00
Victor Vieux
743adaf705 add kernel version
Upstream-commit: 6057e6ad70ba4550df358e89b9a7e1da61666604
Component: engine
2013-07-24 13:36:55 +00:00
Victor Vieux
8d3c08d3c7 bump master
Upstream-commit: ca39f15fa3285e86660cc66d2c3e446e12c9ce86
Component: engine
2013-07-24 13:28:01 +00:00
Victor Vieux
33dd57692c Merge pull request #1271 from dotcloud/1246_change_cfg_format
*Auth: Change dockercfg to json and support multiple auth remote
Upstream-commit: 7953d1becbf1b08e30854684ab7c99bf000e0e77
Component: engine
2013-07-24 05:29:51 -07:00
Victor Vieux
f910d92ead fix tests
Upstream-commit: f4b41e1a6c2c5d531451bf2feeb3877e03eb8c1c
Component: engine
2013-07-24 12:28:22 +00:00
Victor Vieux
5780ce867e bump master
Upstream-commit: 4bc3328e807802d77c1cdb1381d5dadf44daa6db
Component: engine
2013-07-24 12:18:53 +00:00
Victor Vieux
2f6744a52f Merge pull request #1180 from dotcloud/1167_events_endpoint-feature
*Api: Add the /events endpoint
*Client: Add the docker events command
Upstream-commit: ebe17f57ff9f4cce71712c073e74f15085d00501
Component: engine
2013-07-24 04:53:36 -07:00
Victor Vieux
764ae64982 Merge branch 'master' into 1167_events_endpoint-feature
Upstream-commit: ee05f97c9a8542ded8631a33e343f07f1cecd4de
Component: engine
2013-07-24 11:49:04 +00:00
Andy Rothfusz
5190220000 Cleaned up long lines, switched graphic to Docker logo. General cleanup.
Upstream-commit: 78c02d038f90b111f7f8ad306f9573c0f64b370c
Component: engine
2013-07-23 18:13:53 -07:00
Guillaume J. Charmes
600442316a Reimplement old Commands unit tests in order to insure behavior
Upstream-commit: bc823acc255a786b00a7b2759b67fd7b3256fce3
Component: engine
2013-07-23 17:27:49 -07:00
Daniel Mizyrycki
9acb16337a Merge pull request #1147 from dotcloud/1104-testing-static
testing, issue #1104: Make the test use static flags
Upstream-commit: c21c5afe0077cc7a0ac52fb2e77a1c4aacc927ec
Component: engine
2013-07-23 17:07:36 -07:00
Nan Monnand Deng
e919f6ad2f versionCheckers()->versionInfos().
Upstream-commit: 1ae54707a0ee1f690a7dca17d83b5417e83704c3
Component: engine
2013-07-23 17:17:31 -04:00
Nan Monnand Deng
0da0fa300a Rename: VersionChecker->VersionInfo.
Upstream-commit: ede1e6d4754f3cffeac72f5d760fe4d87c5ae570
Component: engine
2013-07-23 17:05:13 -04:00
Victor Vieux
96e4d0d309 Merge branch 'stfp-858-disable-network-configuration'
Upstream-commit: a93a87f64a97f36121dbf3a58fff762f94e5dd73
Component: engine
2013-07-23 19:55:50 +00:00
Victor Vieux
f64e80d22b update AUTHORS
Upstream-commit: 7aba68cd548d69e10e710029ca143b32fd291585
Component: engine
2013-07-23 19:55:38 +00:00
Victor Vieux
8aa1b36505 Merge pull request #1241 from ryfow/patch-1
Make the ENTRYPOINT example work
Upstream-commit: dfc64d157a2a8c387b56a3eea501c726a93f41d0
Component: engine
2013-07-23 08:45:04 -07:00
Victor Vieux
056ee7cfd5 add die event
Upstream-commit: a41384ad7312a21fd8fe429637c8d6b5c883fa2a
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
211bbde153 Add tests for the api
Upstream-commit: ed7a4236b32f3f711c183dff8b70fbef17bae2d7
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
ae5b19f002 use non-blocking channel to prevent dead-lock and add test for server
Upstream-commit: 040c3b50d0a56baf98bd1ec14ad7d59c55a4ab31
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
35c9a9d01e getEvents a bit simpler
Upstream-commit: 8b3519c5f7540b99d19ed2c3163aabf9897dd5a4
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
05d166e113 add docs
Upstream-commit: ec559c02b8dd70692821b3dc7f497d6fccaa88ad
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
012e944035 add since for polling, rename some vars
Upstream-commit: 2e4d4c9f60d0ad92ab0cc84c56c060678222c4db
Component: engine
2013-07-23 15:41:19 +00:00
Victor Vieux
fd89a1c59f add timestamp and change untagged -> untag
Upstream-commit: b8d52ec2669332988a972bff3b5f5d2e9d526b33
Component: engine
2013-07-23 15:41:19 +00:00
Victor Vieux
d1efb7843b basic version of the /events endpoint
Upstream-commit: b5da816487d68853a8ac46630cb3118646f71d2d
Component: engine
2013-07-23 15:41:19 +00:00
Victor Vieux
001001e211 change dockercfg to json and support multiple auth remote
Upstream-commit: 3bae188b8dc51911a44ea1c7b5681f9f07f9d3af
Component: engine
2013-07-23 15:07:18 +00:00
Victor Vieux
be9f5063e4 Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration
Upstream-commit: 8165e51eccd15b7eed3939ada6017ed12b9e81b3
Component: engine
2013-07-23 08:44:12 +00:00
Thatcher
d7840912a6 Merge pull request #1269 from dhrp/new-website-links
Added new docker logo to the documentation header, and added other links to docs header. Tnx @keeb !
Upstream-commit: 9a15db21a6d6b49d4f9626f89f7dfdb276ce7618
Component: engine
2013-07-22 20:48:29 -07:00
Thatcher Peskens
fab05b9aee Added new docker logo to the documentation header, and added other links.
Upstream-commit: 58a1c5720a42fde72c27532ce1122609225bc3bb
Component: engine
2013-07-22 20:26:40 -07:00
Stefan Praszalowicz
d56c0e2aac Invert network disable flag and logic (unbreaks TestAllocate*PortLocalhost)
Upstream-commit: bc172e5e5f1f231f878727a180a8da46e653c0a7
Component: engine
2013-07-22 19:00:35 -07:00
Solomon Hykes
f428eaec77 Typo in 3rd-party
Upstream-commit: 6745bdd0b3a7944985614dae194538645eacb4e7
Component: engine
2013-07-22 18:39:58 -07:00
Solomon Hykes
4966c36265 Hack: completed step 12 of the bootcamp
Upstream-commit: 5714f0a74ef6f6b0be521d7e1e21c1cab1a9ad73
Component: engine
2013-07-22 18:36:36 -07:00
Solomon Hykes
8d7759fbb0 Hack: first draft of the maintainer boot camp. Work in progress!
Upstream-commit: ce43f4af1cf7c2692c4c6203bc5872053d089863
Component: engine
2013-07-22 18:32:55 -07:00
Victor Vieux
9b245d363f Merge pull request #1265 from dotcloud/better-bridge-defaults
*Network: Improve default network configuration 
Upstream-commit: 5d1609f5a28745b112593ba18355b37285516b0c
Component: engine
2013-07-22 13:54:35 -07:00
Solomon Hykes
4f8c565f24 Allocate a /16 IP range by default, with fallback to /24. Try a total of 12 ranges instead of 3.
Upstream-commit: 4714f102d72f03159acd0f7be71cde3d169c06b8
Component: engine
2013-07-22 12:06:24 -07:00
Guillaume J. Charmes
9ed3b16d01 Merge pull request #1262 from dotcloud/1253_add_directory_check
* Runtime: fix error message when invalid directory
Upstream-commit: a675da65e97ac8847f0e22719e2cfdebba201235
Component: engine
2013-07-22 11:54:22 -07:00
Victor Vieux
15d116d5d9 Merge pull request #1236 from dotcloud/1234_overwrites_expose-fix
*Builder: fix overwrites EXPOSE
Upstream-commit: e39755666b2a3c0d9f9f20b727741bb78e903c1e
Component: engine
2013-07-22 09:51:11 -07:00
Victor Vieux
7ae171932b Merge pull request #1264 from dotcloud/fix_tests_env
fix test env
Upstream-commit: 9adba5e2e6dfd712b62982f411ae401776265430
Component: engine
2013-07-22 09:26:34 -07:00