docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
2,497 Commits 12 Branches 297 Tags
2f6744a52f3c646bb61e07cc26b034b9b218bbdd
Commit Graph

2336 Commits

Author SHA1 Message Date
Victor Vieux
764ae64982 Merge branch 'master' into 1167_events_endpoint-feature 
Upstream-commit: ee05f97c9a8542ded8631a33e343f07f1cecd4de
Component: engine
 2013-07-24 11:49:04 +00: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
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
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 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
48287f8a5d fix test env 
Upstream-commit: 5c1af383eb14121174b43fa706f524d4eedd5cad
Component: engine
 2013-07-22 16:26:05 +00:00
Victor Vieux
3b70a407de Merge pull request #1244 from dotcloud/1020_add_variable 
*Runtime: Add container=lxc in default env
Upstream-commit: 8ea9ccf3a7705020d939a186db43821bc4564992
Component: engine
 2013-07-22 09:17:30 -07:00
Victor Vieux
7d9d3be422 fix error message when invalid directory 
Upstream-commit: 74a2b13687787a33b0963f020f704d3cdde4b06d
Component: engine
 2013-07-22 14:52:05 +00:00
Victor Vieux
e57c33a063 Merge pull request #1158 from cespare/1142-docker-add-fix 
*Buildfile: determine a filename from a URL if the destination is a directory
Upstream-commit: 4e7f2b757e9b5c1a0960553938570bee2a54e0c6
Component: engine
 2013-07-22 07:07:04 -07:00
Ken Cochrane
ab81112793 Merge pull request #1259 from dsissitka/patch-3 
*Documentation: Updated the stop command's docs.
Upstream-commit: 2bba279cf18ac3a58b59633b0c6757c03328cb10
Component: engine
 2013-07-22 06:59:02 -07:00
Ken Cochrane
cae7a0b314 Merge pull request #1258 from dsissitka/patch-2 
* Documentation: Added top to the list of commands in the sidebar.
Upstream-commit: 56da77a548cb335bbb44e58bde3ffb003679c67d
Component: engine
 2013-07-22 06:58:09 -07:00
Caleb Spare
e3ecb715a3 Update ADD documentation to specify new behavior. 
Upstream-commit: c383d598809daec6bccd60bd211c10f6a4ef60b0
Component: engine
 2013-07-21 23:32:06 -07:00
Caleb Spare
ed8e1bd7e6 Remove some trailing whitespace. 
Upstream-commit: 416fdaa3d5d7b84f7e36fdfcff7153e3a38262c9
Component: engine
 2013-07-21 23:32:06 -07:00
Caleb Spare
adbaef1554 Buildfile: for ADD command, determine filename from URL. 
This is used if the destination is a directory. This makes the URL
download behavior more closely match file copying.

Fixes #1142.
Upstream-commit: 2b0ebf5d32c65276ce50fce168f32483ffb9c311
Component: engine
 2013-07-21 23:32:06 -07:00
Caleb Spare
02d9506654 Test pulling remote files using ADD in a buildfile. 
Upstream-commit: f236e62d9d288ac695129157d1753512f5cd2b0a
Component: engine
 2013-07-21 23:32:01 -07:00
Stefan Praszalowicz
466341e775 Document -b none 
Upstream-commit: 964e826a9beb69a0246ed22c7935fd86df6712e1
Component: engine
 2013-07-21 18:01:52 -07:00
Stefan Praszalowicz
ca9f0f0f1d Support completely disabling network configuration with docker -d -b none 
Upstream-commit: 49673fc45cc5cfc15219bf1eb6eaff7621696919
Component: engine
 2013-07-21 17:49:09 -07:00
Stefan Praszalowicz
edbf8f58a1 Support networkless containers with new docker run option '-n' 
Upstream-commit: 3342bdb33184b83cac66921807c5403168d13f6b
Component: engine
 2013-07-21 17:11:47 -07:00
David Sissitka
52d2580351 Updated the stop command's docs. 
Upstream-commit: 1d02a7ffb63915055f5fd9bda420bd08a8679da1
Component: engine
 2013-07-21 19:00:18 -04:00
dsissitka
d051cf7ec4 Added top to the list of commands in the sidebar. 
Upstream-commit: 788935175e8500b451a844f6971ac62dd099bdfc
Component: engine
 2013-07-21 18:30:51 -04:00
dsissitka
885edf50ba Fixed a couple of minor syntax errors. 
Upstream-commit: 32663bf431b64d1169509bacba36e3c90e131b44
Component: engine
 2013-07-20 21:27:55 -04:00
Guillaume J. Charmes
9c4e7803c8 Merge pull request #1242 from dotcloud/remove_usage_from_test 
remove usage from tests
Upstream-commit: e3be2e959bb4729d25e44cb25bf4e8bf733d8d89
Component: engine
 2013-07-19 14:07:24 -07:00
Victor Vieux
d5db6e05ee add container=lxc in default env 
Upstream-commit: 67f1e3f5ed4d3061e07e910e28ac866b7bb13e18
Component: engine
 2013-07-19 17:22:16 +00:00
Andy Rothfusz
a8e35fc588 Merge pull request #1235 from metalivedev/cleandocbld 
Make docs build without warnings or errors. Minor additional cleanup.
Upstream-commit: 23ea9b8968b5c79760e5dbe4e6e92e1e05fe7361
Component: engine
 2013-07-19 09:44:53 -07:00
Victor Vieux
6e52a096e9 remove usage from tests 
Upstream-commit: ea1258852493a83754553163db1db52a72ffb8fc
Component: engine
 2013-07-19 15:56:00 +00:00
Ryan Fowler
1ef21555e9 Make the ENTRYPOINT example work 
The incantation listed in the ENTRYPOINT example didn't actually pass the arguments to your script. Changing the definition to an array fixes this.
Upstream-commit: e8ad82f9ba126414e1813fadfb17167a34afa8d4
Component: engine
 2013-07-19 10:11:21 -05:00
Victor Vieux
c311fa3aa0 rebase master 
Upstream-commit: 2e0e455fa696db7a16a08b6c7dd2def7c5ff837f
Component: engine
 2013-07-19 14:48:32 +00:00
Victor Vieux
f380201be8 fix error in utils tests 
Upstream-commit: 2e3b660dd0d49dc78f4c486e952ea6db9c007d6a
Component: engine
 2013-07-19 13:56:36 +00:00
Victor Vieux
c5cd9cfc76 Merge pull request #1211 from dotcloud/new_logs 
*Runtime: Logs are now synchronised
Upstream-commit: 0bd534adcf0933d19540506f790d00d8d1cb23d4
Component: engine
 2013-07-19 06:43:29 -07:00
unclejack
1b1ac70ce1 create the cidfile before creating the container 
This change makes docker attempt to create the container ID file and
open it before attempting to create the container. This avoids leaving
a stale container behind if docker has failed to create and open the
container ID file.

The container ID is written to the file after the container is created.
Upstream-commit: 25be79208a1473a65be883989ae49b7c71081a83
Component: engine
 2013-07-19 16:03:45 +03:00
unclejack
59b7a438c9 docs - add example for cidfile 
Upstream-commit: 2a3b91e3b66c48c6a26dbd673957a46c1afacbbe
Component: engine
 2013-07-19 16:03:45 +03:00
unclejack
ce2e737919 docs - add cidfile flag to run docs 
Upstream-commit: 221ee504aa06d06eb868898cca2fcc020a861e84
Component: engine
 2013-07-19 16:03:45 +03:00