docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
4,218 Commits 12 Branches 296 Tags
e69802932f453333aab8a16319ba3db4792cb186
Commit Graph

117 Commits

Author SHA1 Message Date
Solomon Hykes
c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
 2013-11-07 23:26:52 +00:00
Guillaume J. Charmes
6d24142423 go fmt 
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
 2013-11-07 12:27:33 -08:00
Mark Allen
a507d209c4 Prevent DNS server conflicts in CreateBridgeIface 
Retrieve /etc/resolv.conf data (if available)

Add checkNameserverOverlaps and call it to
make sure there are no conflicts

Add utils.GetNameserversAsCIDR and tests

Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
 2013-11-05 21:24:37 -06:00
Michael Crosby
062afa9bce Merge pull request #2427 from thequux/send-headers-immediately 
Make /events API send headers immediately
Upstream-commit: 2a0efb23243f2e72e61efa51ceaafa58353cf21b
Component: engine
 2013-11-04 08:49:27 -08:00
Dan Hirsch
ee347d7b68 Added explicit Flush method to utils.WriteFlusher 
Upstream-commit: a963ff5d8df4e6d0e42dd669d3d60aafb8f880a7
Component: engine
 2013-11-01 13:11:21 -04:00
Solomon Hykes
c2b31012f8 Partial merge of devmapper/ in order to integrate it as a backend 
plugin.

The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
Upstream-commit: 36c7a7ae943220ffb1bea9cd47d2f586db00eab2
Component: engine
 2013-11-01 04:24:17 +00:00
Tianon Gravi
7f47a302d5 Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary 
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
 2013-10-25 15:13:25 -07:00
Alexander Larsson
cd17fb7c91 Move ListOps to utils submodule 
This will be needed for later use in docker-init without a docker
dependency
Upstream-commit: d063c8d941d366e4815b91c4fa4fc91fc1e1eb23
Component: engine
 2013-10-25 15:13:24 -07:00
Michael Crosby
952ac8a789 Add links for container relationships and introspection 
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
 2013-10-25 15:13:24 -07:00
Yang Bai
3f6f7d77a8 let utils.ParseHost return err when errors happen 
Upstream-commit: e81da876df57fb8e0562cc64e7b57dc7eb32284a
Component: engine
 2013-10-24 13:23:02 +08:00
Yang Bai
4cbb2084bc refactor utils.ParseHost with switch-case, so we can add other proto support easily 
Upstream-commit: 99f16755661de79cac1ccda78e3e96552f6a4491
Component: engine
 2013-10-23 18:29:35 +08:00
Guillaume J. Charmes
f83e69dc32 Merge branch 'master' into dm 
Conflicts:
	Dockerfile
	buildfile.go
	container.go
	hack/make/test
	runtime_test.go
	utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine
 2013-10-18 12:38:29 -07:00
Jérôme Petazzoni
d7c383fbe1 Catch errClosing error when TCP and UDP proxies are terminated. 
Upstream-commit: cc851dbb3f4725562729f12663e246690a61c620
Component: engine
 2013-10-16 14:43:20 -07:00
Alexander Larsson
db72642777 Add some docs for newly exported functions 
Upstream-commit: 8e4b3a33906785c3181151cc46bb323952f6eb2b
Component: engine
 2013-10-14 10:53:12 +02:00
Karl Grzeszczak
b2ba4dc1a1 Initial steps to fix Issue #936 
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
 2013-10-11 08:04:40 -05:00
Solomon Hykes
715688eb5e Merged master into device-mapper branch 
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
 2013-10-10 12:50:30 -07:00
Guillaume J. Charmes
7dc11f73be Random improvments 
Upstream-commit: 8b2f4aab232880cb0d7faa18ae12adb33f483b2c
Component: engine
 2013-10-02 20:18:15 -07:00
Alexander Larsson
d224af31e1 ShellQuoteArguments: Fix quoting 
This accidentally used two quotes to start/end each quoted string.
Upstream-commit: f99f39abaa5a43e9abc19add5b9d1253a1d22485
Component: engine
 2013-09-26 15:09:33 +00:00
Alexander Larsson
9536e01f9b Utils: Add ShellQuoteArguments 
Upstream-commit: d80be57c1538905a46f75c95d592acec49a498d6
Component: engine
 2013-09-26 15:09:32 +00:00
Victor Vieux
fb9071f221 only os.Exits on error 
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
 2013-09-09 21:26:35 +00:00
Guillaume J. Charmes
eed5427302 Remove import os/user 
Upstream-commit: b07314e2e066a1308040e1eb45a96a0e1056f28a
Component: engine
 2013-09-06 23:00:21 +00:00
shin-
32d6ba57cb Compute dependency graph and upload layers in the right order when pushing 
Upstream-commit: b3a70d767d913ec476bc1af53983c91a10d17f84
Component: engine
 2013-09-04 02:21:40 +02:00
Michael Crosby
8468ddcf8f Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing 
Proper resolv.conf parsing
Upstream-commit: 84431ec03c08f0d8ce8f9385aa1b709a28fef1f3
Component: engine
 2013-08-30 12:10:45 -07:00
daniel-garcia
53272d3dc7 write newline after every log message. 
Upstream-commit: d593f579528d2555296b535aeae8383f5d2ee9b3
Component: engine
 2013-08-27 14:09:26 -05:00
Mohit Soni
b48c0523d0 Refactored code and added unit tests 
- Extracted ParseRelease method from GetKernelVersion to make code
  more testable
- Added tests for ParseRelease method
Upstream-commit: f4432d50c388c242bba6b697f31b32f1fe21ff65
Component: engine
 2013-08-24 00:24:40 -07:00
Mohit Soni
c0c4da0db6 Fixes #1643 
Changed the split statement, from SplitN to Split. Doing so takes
care of cases, when a minor version is followed by a suffix, that
starts with '.'.
Upstream-commit: ab882da03b57037885c4222f474fa8bd37a01956
Component: engine
 2013-08-23 14:37:37 -07:00
Thijs Terlouw
6fad2c6e0b Keep linebreaks and generalize code 
Upstream-commit: c349b4d56c338bc43c81667bb927518b923998cb
Component: engine
 2013-08-21 15:48:39 +02:00
Thijs Terlouw
f2e7496ac3 proper resolv.conf parsing 
Upstream-commit: 62e84785b6ffec04a39cf611d7eaff21f2532195
Component: engine
 2013-08-21 15:23:12 +02:00
Victor Vieux
6fda0862e2 hot fix display in parallel pull and go fmt 
Upstream-commit: d7979ef2d0044dc7def9238f0a1aed909f0590bb
Component: engine
 2013-08-15 11:42:40 +00:00
Victor Vieux
2037ff0102 ensure the use oh IDs and add image's name in /events 
Upstream-commit: 703905d7ece5b4a71ae1faf2743341ace98c4fbb
Component: engine
 2013-08-12 11:50:03 +00:00
Victor Vieux
232667a23e fix docker build and docker events output 
Upstream-commit: 213365c2d27734bfbeeb1fc102fded7625550982
Component: engine
 2013-08-08 22:51:39 +00:00
Victor Vieux
82d1681ff0 fix small \n error un docker build 
Upstream-commit: ba17f4a06a75a66e11b6cf2ca2cdb5bee4f7bfa8
Component: engine
 2013-08-06 14:31:51 +00:00
Victor Vieux
d457571635 rebase master 
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
 2013-08-05 16:25:42 +00:00
Victor Vieux
37bc41c2c0 Merge pull request #1389 from dotcloud/1373-improve_checklocaldns 
Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 030cc8d5cc2df5a8f8f6acb3724c1e6016363d95
Component: engine
 2013-08-05 02:29:36 -07:00
Guillaume J. Charmes
6b62e3168d Merge pull request #1298 from crosbymichael/1246-auth-request 
* Registry: Do not require login unless 401 is received on push
Upstream-commit: 4dcc0f316c6dbcad3932b483ad0946a4b7d526cc
Component: engine
 2013-08-02 17:39:54 -07:00
Michael Crosby
3029f070e6 Return JSONError for HTTPResponse error 
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
 2013-08-03 00:27:58 +00:00
Guillaume J. Charmes
71b5dff299 Consider empty /etc/resolv.conf as local dns + add unit test 
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
 2013-08-02 15:23:36 -07:00
Michael Crosby
7aa4663949 Return registy status code in error 
Added Details map to the JSONMessage
Upstream-commit: 3043c2641990d94298c6377b7ef14709263a4709
Component: engine
 2013-07-30 23:24:31 +00:00
Victor Vieux
c7d245ec6d Add check that the request is good 
Upstream-commit: e4752c8c1a09fc3cc96dbb9be7183b271db3d6b7
Component: engine
 2013-07-30 16:42:32 +00:00
Victor Vieux
ccc9b252b2 Merge branch 'master' into add_last_version-feature 
Upstream-commit: 99c27fa0ddf6db7eb8a1b9484ea6ad19c0b2e4f5
Component: engine
 2013-07-30 16:23:06 +00:00
Victor Vieux
d2c440fbc7 add parallel pull to 1.4 
Upstream-commit: 46f59dd9333baa578b184eb25b386ac2f41caf04
Component: engine
 2013-07-30 12:15:33 +00:00
Victor Vieux
d85812a80e rebase master 
Upstream-commit: e1fa989ec9a2355da2a87707f4909647b69831b3
Component: engine
 2013-07-30 11:59:31 +00: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
Victor Vieux
1a3ff090dc fix errors 
Upstream-commit: 01e98bf0dd26a1de7fd280fd4b0f0a79aedd0cdd
Component: engine
 2013-07-25 14:32:46 +00:00
Victor Vieux
ce008bc612 Use VT100 escape codes 
:
Upstream-commit: f1dd299227b15696872822f40a4ab9f1a54098a7
Component: engine
 2013-07-25 14:16:36 +00:00
Victor Vieux
a761fb8db0 improve client output 
Upstream-commit: 8742649aa7f3524bbfa99b68c8d87ffc5aba0af9
Component: engine
 2013-07-24 17:10:59 +00:00
Victor Vieux
53749f98ce Add ID to JSONMessage in pull 
Use goroutines to pull in parallel
If multiple images pulled at the same time, each progress is displayed on a new line
Upstream-commit: 0e71e368a8a781f593b25fdd1318d3882e6d28e5
Component: engine
 2013-07-24 15:41:34 +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
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