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
2,650 Commits 12 Branches 296 Tags
4c19fdff3976f1bd339121c4567775cbe60290a8
Commit Graph

84 Commits

Author SHA1 Message Date
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
Victor Vieux
f64e80d22b update AUTHORS 
Upstream-commit: 7aba68cd548d69e10e710029ca143b32fd291585
Component: engine
 2013-07-23 19:55:38 +00:00
Solomon Hykes
1aa0235482 Hack: use helper functions in tests for less copy-pasting 
Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797
Component: engine
 2013-07-12 17:56:55 -07:00
Solomon Hykes
6c9e32ae32 Simplify unit tests code with mkRuntime() 
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
 2013-07-11 17:59:25 -07:00
Louis Opter
cafbcadc85 Make the TestAllocate{UDP,TCP}PortLocalhost more reliable 
- For the TCP test try again if socat wasn't listening yet;
- For the UDP test raise the timeout to a minute to workaround what
  seems to be an issue with Linux.
Upstream-commit: 5a411fa38e49e5d79602f01fa9aaf058c12e5627
Component: engine
 2013-07-10 18:25:53 -07:00
Louis Opter
26ac911253 Raise the timeouts for the TCP/UDP localhost proxy tests 
Sometimes these tests fail, let's see if that improves the situation.
Upstream-commit: 8f36467107d623e94638e2dd4c625e34f670384d
Component: engine
 2013-07-10 16:05:14 -07:00
Louis Opter
c69035fce1 Add support for UDP (closes #33) 
API Changes
-----------

The port notation is extended to support "/udp" or "/tcp" at the *end*
of the specifier string (and defaults to tcp if "/tcp" or "/udp" are
missing)

`docker ps` now shows UDP ports as "frontend->backend/udp". Nothing
changes for TCP ports.

`docker inspect` now displays two sub-dictionaries: "Tcp" and "Udp",
under "PortMapping" in "NetworkSettings".

Theses changes stand true for the values returned by the HTTP API too.

This changeset will definitely break tools built upon the API (or upon
`docker inspect`). A less intrusive way to add UDP ports in `docker
inspect` would be to simply add "/udp" for UDP ports but it will still
break existing applications which tries to convert the whole field to an
integer. I believe that having two TCP/UDP sub-dictionaries is better
because it makes the whole thing more clear and more easy to parse right
away (i.e: you don't have to check the format of the string, split it
and convert the right part to an integer)

Code Changes
------------

Significant changes in network.go:

- A second PortAllocator is instantiated for the UDP range;
- PortMapper maintains separate mapping for TCP and UDP;
- The extPorts array in NetworkInterface is now an array of Nat objects
  (so we can know on which protocol a given port was mapped when
  NetworkInterface.Release() is called);
- TCP proxying on localhost has been moved away in network_proxy.go.

localhost proxy code rewrite in network_proxy.go:

We have to proxy the traffic between localhost:frontend-port and
container:backend-port because Netfilter doesn't work properly on the
loopback interface and DNAT iptable rules aren't applied there.

- Goroutines in the TCP proxying code are now explicitly stopped when
  the proxy is stopped;
- UDP connection tracking using a map (more infos in [1]);
- Support for IPv6 (to be more accurate, the code is transparent to the
  Go net package, so you can use, tcp/tcp4/tcp6/udp/udp4/udp6);
- Single Proxy interface for both UDP and TCP proxying;
- Full test suite.

[1] https://github.com/dotcloud/docker/issues/33#issuecomment-20010400
Upstream-commit: fac0d87d00ada08309ea3b82cae69beeef637c89
Component: engine
 2013-07-09 17:42:35 -07:00
Louis Opter
ea75ddf770 Fix a typo in runtime_test.go: Availalble -> Available 
Upstream-commit: 1a1daca621233b4588c079e35851d0e542282124
Component: engine
 2013-07-09 11:52:33 -07:00
Guillaume J. Charmes
32424f76bf Remove all network dependencies from the test suite 
Upstream-commit: e43ef364cb99585d3285f51f7ab308f8a77fe09e
Component: engine
 2013-07-08 15:23:04 -07:00
Sam Alba
203bc7383a Fixed runtime_test (ImagePull prototyped changed) 
Upstream-commit: e2b8ee2723a4cf6a37cdb455011ec447f23f8f49
Component: engine
 2013-07-05 16:03:22 -07:00
Caleb Spare
15bf500531 Typo fix 
Error message grammar tweak
Upstream-commit: ba9aef6f2c529ccea571deacc46d2a61ca74a8bc
Component: engine
 2013-07-04 12:40:14 -07:00
Caleb Spare
1c71d0a65e Implement several golint suggestions, including: 
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
 2013-07-03 14:36:04 -07:00
Caleb Spare
8f5746f4d9 Mutex style change. 
For structs protected by a single mutex, embed the mutex for more
concise usage.

Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
 2013-07-02 15:53:08 -07:00
Victor Vieux
438fda3245 add sleep in tests and go fmt 
Upstream-commit: ebba0a60245b487e6d3d242f47c8999321ec5d29
Component: engine
 2013-07-02 10:47:37 +00:00
Guillaume J. Charmes
4fd8f2839f Fix unit tests when there is more than one tag within the test image 
Upstream-commit: b6f288a1cedbbff7dd24362f2fc2bce0040bfe10
Component: engine
 2013-07-01 11:45:45 -07:00
Solomon Hykes
f44918dcc7 * Hack: move unit tests to a different source image, to work around issues when docker-ut has more than 1 tag. 
Upstream-commit: b7226316c716daf7648b2dc4de829f866a4377b5
Component: engine
 2013-06-28 19:43:55 -07:00
Louis Opter
e4d371fd60 Always return the correct test image. 
And not a *random* one from its history.
Upstream-commit: fe014a8e6cfe4d2a338736e4c685bcf1b7685200
Component: engine
 2013-06-27 18:01:20 -07:00
Gabriel Monroy
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b' 
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
 2013-06-26 15:07:31 -07:00
Guillaume J. Charmes
51f8e07a39 Implement regression test for stdin attach 
Upstream-commit: 5190f7f33a9e36f1f5991a385f4db198e9f1b3a6
Component: engine
 2013-06-24 18:36:04 -07:00
Guillaume J. Charmes
38132ab186 Make NewDockerCli handle terminal 
Upstream-commit: 873a5aa8e72102a31f34c62603a3f5976471e94a
Component: engine
 2013-06-24 18:29:08 -07:00
Guillaume J. Charmes
40e51bbd8c Make DockerCli use its own stdin/out/err instead of the os.Std* 
Upstream-commit: a749fb21309b147a1bb9da0838f591ba58f6d169
Component: engine
 2013-06-24 18:27:57 -07:00
Solomon Hykes
d6968c304b Remove dependency on 'os/user', which cannot be used with CGO_ENABLED=0. This allows running the tests without CGO. 
Upstream-commit: ce9e50f4eeed9ec9d715d805ae6706ed6f28da3b
Component: engine
 2013-06-21 19:40:42 -07:00
Guillaume J. Charmes
18c9c45d0a - Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311 
Upstream-commit: fe204e6f48eb47a1deb3553003eaf9863a66fd1a
Component: engine
 2013-06-17 16:10:00 -07:00
Victor Vieux
4147a474f5 rebase master 
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
 2013-06-13 17:58:06 +00:00
Victor Vieux
fc1bee82c0 Merge branch 'master' into 691-run_id-feature 
Upstream-commit: 9cdd39e0d76079206cc1befe222e2205128e5ed0
Component: engine
 2013-06-13 13:18:43 +00:00
Victor Vieux
00bcb3e136 added test 
Upstream-commit: 45a8945746a205ea513efc17bb242c63362c79a9
Component: engine
 2013-06-13 13:17:56 +00:00
Victor Vieux
83d9b24a84 bump to master 
Upstream-commit: c906239220c7ba06b8615f001fab2f42fb063aeb
Component: engine
 2013-06-05 10:23:45 +00:00
Victor Vieux
4747c5b99f linted names 
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
 2013-06-04 18:00:22 +00:00
Victor Vieux
5a833bafbe bump to master 
Upstream-commit: 62c78696cda5660524dee596a07aac66d89437af
Component: engine
 2013-06-03 11:06:13 +00:00
Guillaume J. Charmes
934fcbd514 Merge pull request #719 from dotcloud/json_stream-feature 
* API: push, pull, import, insert -> Json Stream
Upstream-commit: 9bc71c101c8f1299427013bfb5503bf85173c28f
Component: engine
 2013-05-31 16:05:15 -07:00
Victor Vieux
167d529e1c ensure progress downloader is well formated 
Upstream-commit: cd002a4d162aa273cd9e646e6fd124ef2b6f6944
Component: engine
 2013-05-30 17:00:42 +00:00
Victor Vieux
e8420b7464 move auth to the client WIP 
Upstream-commit: 49e656839fb3d846dc65fec544f2984a9c72a2cf
Component: engine
 2013-05-30 15:39:43 +00:00
Victor Vieux
654be8b3a8 if address already in use in unit tests, try a different port 
Upstream-commit: 2a53717e8ff01df7c58485f89845bad31e50f497
Component: engine
 2013-05-30 13:45:39 +00:00
Guillaume J. Charmes
f8799691fc Merge pull request #739 from dotcloud/push_issue-1 
- Registry: Cereate a new registry object for each request (~session)
Upstream-commit: 08e5f1295487f2c06639bc8ac97be35f30359534
Component: engine
 2013-05-29 09:22:12 -07:00
Victor Vieux
06534c45f7 bump to master 
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
 2013-05-29 13:52:18 +00:00
Guillaume J. Charmes
f9738020b7 Update tests with new cookies for registry 
Upstream-commit: b76d6120ac66a853d177f7e53318ab1ee75dca92
Component: engine
 2013-05-28 17:35:10 -07:00
Guillaume J. Charmes
2c506017f0 Readd build tests 
Upstream-commit: 5b33b2463a27aa3356a4b6200cf4b81dd83c26a0
Component: engine
 2013-05-28 15:31:06 -07:00
Guillaume J. Charmes
d21f15c6b9 Merge master 
Upstream-commit: dce82bc85615ca09c999bc2186c2c9caf348dc33
Component: engine
 2013-05-28 13:42:50 -07:00
Guillaume J. Charmes
dda3557a3e Implement the CmdAdd instruction 
Upstream-commit: 6ae3800151025ff73a97c40af578ee714164003b
Component: engine
 2013-05-28 13:38:26 -07:00
Victor Vieux
04ca200a24 imporved error, push, import insert 
Upstream-commit: c8c7094b2e8088210e2182e582264e09222c6e3d
Component: engine
 2013-05-25 15:09:46 +00:00
Solomon Hykes
0fb224b331 Fix a unit test broken by pull request #703 
Upstream-commit: bb4b35a8920bcba8b60784297650ced5b2e01e47
Component: engine
 2013-05-24 18:32:21 -07:00
Guillaume J. Charmes
4f2b2696d3 Update tests to reflect new AuthConfig 
Upstream-commit: 10e19e4b97dba71b603d652d5a046ef792d9d704
Component: engine
 2013-05-15 17:31:11 -07:00
Guillaume J. Charmes
741f6efe46 Update tests to reflect new project structure 
Upstream-commit: e7077320ff6452984260c14394c271db080b5e9c
Component: engine
 2013-05-15 01:52:09 +00:00
Victor Vieux
8ba22c1167 Merge branch 'master' into remote-api 
Upstream-commit: 32cbd72ebeedfd6be71cf840f8b56a19e2c0e64c
Component: engine
 2013-05-07 21:02:32 +02:00
Victor Vieux
521aa8b1ce added search 
Upstream-commit: 59a6316f5e0810009f5986d62f1707f8d0a6650e
Component: engine
 2013-05-07 20:43:31 +02:00
Guillaume J. Charmes
664f8fbbbd Check the command existance prior create and add Unit tests for the case 
Upstream-commit: 42b1ea4889cd61790f81001ada5deac9354be378
Component: engine
 2013-05-07 11:18:13 -07:00
Victor Vieux
44910e43b1 update to master 
Upstream-commit: 10c0e990371e065d4fc1c9b680f03a46e5bacc5e
Component: engine
 2013-05-07 19:23:50 +02:00
Guillaume J. Charmes
7b2bb0c965 Update the unit tests to reflect the new API 
Upstream-commit: ff95f2b0ecf54fdfeffa1aa008e22cb5c7ec59d6
Component: engine
 2013-05-06 16:00:30 -07:00
Victor Vieux
3a6a7097c6 split api and server. run return exit code. import, pull and commit uses the smae endpoint. non zero status code on failure 
Upstream-commit: 04cd20fa627635d30ea315d0d4e281e10e8d293c
Component: engine
 2013-05-06 11:31:22 +02:00
Guillaume J. Charmes
91fa0f0669 Move the capabilities detection into a runtime method 
Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e
Component: engine
 2013-04-26 14:32:55 -07:00