docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
5,871 Commits 12 Branches 297 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

5871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux
de5cf1eef5 add debug for error in the server 
Upstream-commit: b7937e268fcbc529a168164fc242edc56d51094c
Component: engine
 2013-07-11 12:21:43 +00: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
Daniel Mizyrycki
1aa2442604 Packaging, issue #1174: Add pure binary to docker release 
Upstream-commit: bf26ae03cfe38fc0fdd6f7dedd53041204df0767
Component: engine
 2013-07-10 17:39:00 -07:00
Andy Rothfusz
720f595c48 Merge pull request #1178 from dotcloud/fix-dev-environment 
Fix outdated docs explaining how to setup a dev environment
Upstream-commit: 3363cd5cd03ccc7d13517f5c3ec01017b26c0f5c
Component: engine
 2013-07-10 16:53:22 -07:00
Daniel Mizyrycki
a7f78c9225 Merge pull request #1183 from dotcloud/960-packaging-PPA 
Packaging, issue #960: Document PUBLISH_PPA for staging/production release
Upstream-commit: 5c49a6135370c0adc485409cda3b2147df6e6b3a
Component: engine
 2013-07-10 16:16:31 -07:00
Daniel Mizyrycki
646603a285 Packaging, issue #960: Document PUBLISH_PPA for staging/production release 
Upstream-commit: f83c31e18834d57ec56e1249b80174fbe0a0f8c9
Component: engine
 2013-07-10 16:06:49 -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
Nan Monnand Deng
ebb59e49d1 reduce the number of string copy operations. 
Upstream-commit: 73e79a3310f3976b61a295f45e12aead9af41962
Component: engine
 2013-07-10 18:59:43 -04:00
Nan Monnand Deng
98e450c93d format in the user agent header should follow RFC 2616 
Upstream-commit: 34cf976866f66bc77b961f4e66a9dd8aad1ffb00
Component: engine
 2013-07-10 18:59:43 -04:00
Nan Monnand Deng
81ebd3a19c Removed an unnecessary nil assignment 
Upstream-commit: e832b01349fec2acee6ec3219dc9bfb61ad38764
Component: engine
 2013-07-10 18:56:49 -04:00
Nan Monnand Deng
9939aac9f5 Removed an unnecessary error check. 
Upstream-commit: 26c8eae6fea53e9a78bd035614fff20086f00b17
Component: engine
 2013-07-10 18:56:49 -04:00
Nan Monnand Deng
5042ef8b4a added client's kernel version 
Upstream-commit: d40efc4648af6bb5c60b37a789effd602af1f132
Component: engine
 2013-07-10 18:56:49 -04:00
Nan Monnand Deng
addc24cbb8 Insert version checkers when call NewRegistry() 
Upstream-commit: 5705a493080ba5571a7929d37e7926678a982cb4
Component: engine
 2013-07-10 18:56:49 -04:00
Nan Monnand Deng
d233f1b215 added APIVersion when call NewRegistry 
Upstream-commit: 65185a565b8e05a2dd58e10d1c1ad560f4a255cf
Component: engine
 2013-07-10 18:53:38 -04:00
Nan Monnand Deng
4c0f88c190 inserted setUserAgent in each HTTP request 
Upstream-commit: 1bb8f60d5ae3810b465dd3c79a7a572fb017d078
Component: engine
 2013-07-10 18:49:01 -04:00
Nan Monnand Deng
eb5095a476 Added version checker interface 
Upstream-commit: 1d01189f04f5187bd39e9212b7af3b3e83e86361
Component: engine
 2013-07-10 18:49:01 -04:00
Victor Vieux
dedc7724c8 change tag -> repo name in build usage 
Upstream-commit: fc3a8e409d182ade45c697c244562e20beee9f9a
Component: engine
 2013-07-10 22:44:31 +00:00
Louis Opter
61dbbbb8fe Merge pull request #1181 from dotcloud/export_portmapping 
Export PortMapping in container.go
Upstream-commit: 8e49cb453f7ed8469d1a10c784f8f8250e049623
Component: engine
 2013-07-10 14:24:20 -07:00
Michael Crosby
72cf50da58 Rebased changes buildfile_test 
Upstream-commit: 40f1e4edbecc841bd02b3a63b303d522299562c0
Component: engine
 2013-07-10 07:12:57 -09:00
Michael Crosby
8121ba998d Add unittest for volume config verification 
Upstream-commit: 1267e15b0f73f4c40b3a053f0bf02981881a2bdd
Component: engine
 2013-07-10 06:59:16 -09:00
Michael Crosby
7935041f18 Add VOLUME instruction to buildfile 
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
 2013-07-10 06:59:16 -09:00
Victor Vieux
252d0573c7 Merge pull request #1151 from alex/patch-1 
Replaced gendered language in the README
Upstream-commit: 43b346d93b7a2bba58628fafcc9391a3203cef91
Component: engine
 2013-07-10 07:52:30 -07:00
Victor Vieux
b293c53143 export portmapping in network.go 
Upstream-commit: d918c7d9de6a2949d4010ec08f08b0182d159fe7
Component: engine
 2013-07-10 14:09:35 +00:00
Victor Vieux
e5131fecc0 Merge pull request #1168 from dotcloud/standalone_registry 
* Server: Allow push on standalone registry
Upstream-commit: e962e9edcf58609aa7f7b12640d27c76c3e43f10
Component: engine
 2013-07-10 04:14:23 -07:00
Victor Vieux
e385864d22 Merge pull request #1177 from lopter/udp-support-final 
* Network: Add UDP support
Upstream-commit: b7a62f1f1b7826476507d9f07c796e12cbffec95
Component: engine
 2013-07-10 03:55:18 -07:00
Victor Vieux
eae9a1bd52 Merge pull request #1164 from dotcloud/1162-import_hangs-fix 
* Runtime: Untar is now faster
Upstream-commit: 2e5d1a2d48b2697cdd7835261553b957427deab6
Component: engine
 2013-07-10 03:37:24 -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
Solomon Hykes
63618e51b5 Fix outdated docs explaining how to setup a dev environment. Building docker with docker ftw 
Upstream-commit: a839b36e55da231874b312ee184c9d8164460bdc
Component: engine
 2013-07-09 16:48:16 -07:00
Sam Alba
975937c08c Hardened repos name validation 
Upstream-commit: 316c8328aab8f9d518574b4bef9e537fed4185f6
Component: engine
 2013-07-09 16:46:55 -07:00
Sam Alba
f0cbbe98e7 Fixed tag parsing when the repos name contains both a port and a tag 
Upstream-commit: e8db0311120d5e9a545fde5862f8a16b07760697
Component: engine
 2013-07-09 16:46:25 -07:00
Sam Alba
e783956d16 Fixing missing tag field when pulling containers which does not exist 
Upstream-commit: 59b785a2820e9ff07ce2a71c83eef8b6ccc467cc
Component: engine
 2013-07-09 16:45:32 -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
Sam Alba
9f779bc589 Merge branch 'master' of github.com:dotcloud/docker into standalone_registry 
Upstream-commit: 837be914ca96c1f03d835a7b834693be16ce7043
Component: engine
 2013-07-09 11:31:14 -07:00
Sam Alba
916139ebc6 Fixed potential security issue (never try http on official index when polling the endpoint). Also fixed local repos name when pulling index.docker.io/foo/bar 
Upstream-commit: f44eac49fae1b33e6ff4c6f42c5e7305caf22252
Component: engine
 2013-07-09 11:30:12 -07:00
Guillaume J. Charmes
044e4ac12c Merge pull request #1166 from dotcloud/networkless_tests-2 
* Tests: Remove all network dependencies from the test suite
Upstream-commit: 0acdef45499a5e51dbc56b34090e395af8820fa7
Component: engine
 2013-07-09 11:20:18 -07:00
Guillaume J. Charmes
99f25a63ad Merge pull request #1173 from dotcloud/1172-ghost_restart-fix 
Make sure container is not marked as ghost when it starts
Upstream-commit: 7d8ef90ccbbe5e945b8a13bfcbea7838c138f61b
Component: engine
 2013-07-09 10:49:17 -07:00
Guillaume J. Charmes
3cfd5fdb16 Make sure container is not marked as ghost when it starts 
Upstream-commit: 91520838fc72f4004d65844b8e57df85473808a1
Component: engine
 2013-07-09 10:48:33 -07:00
Guillaume J. Charmes
44da1d38e6 Merge pull request #1049 from dotcloud/1040_ignore_stderr_tests-fix 
- Tests: Ignore stderr while doing tests
Upstream-commit: ada0e1fb0817d2e609b46c260ef6ab0cfa510379
Component: engine
 2013-07-09 10:32:24 -07:00
Sam Alba
0cf9a0c877 Removed DOCKER_INDEX_URL 
Upstream-commit: 33d97e81ebc4d25ecc7366aeef625e51aa69478c
Component: engine
 2013-07-09 08:10:43 -07:00
Sam Alba
13a18e3d5d Moved parseRepositoryTag to the utils package 
Upstream-commit: 019324015b0c64733ae4f39708aa49a08134cb48
Component: engine
 2013-07-09 08:06:10 -07:00
Victor Vieux
e2583b0738 Merge pull request #1170 from dotcloud/fix_type_socket 
Fix typo socket
Upstream-commit: 72d278fdacf537d44a39244ade8ce03d02a00095
Component: engine
 2013-07-09 03:57:45 -07:00
Victor Vieux
80e25aa274 fix typo 
Upstream-commit: 05d7f85af9e5813ddb1c066e44c802dc33790547
Component: engine
 2013-07-09 10:55:28 +00:00
Solomon Hykes
fd7c117636 Merge pull request #1013 from dotcloud/standardize-build 
* Hack: standardized docker's build environment in a Dockerfile
Upstream-commit: 7fba358ae2ba434bdd23da1bd46126ccdd23f749
Component: engine
 2013-07-08 21:33:45 -07:00
Solomon Hykes
f46f2cd5f6 * Hack: standardized docker's build environment in a Dockerfile 
Upstream-commit: 9f1fc40a64fd6863dec5298099041493fee87db5
Component: engine
 2013-07-08 21:30:29 -07:00
Sam Alba
003e7619de Fixed typo (thanks unit tests) 
Upstream-commit: 3be7bc38e034c94da7cd6da5f2e5ecffd1832d6b
Component: engine
 2013-07-08 17:42:18 -07:00
Sam Alba
e5ac013477 Re-implemented a notion of local and private repos. This allows to consider the full qualified name of the repos as the name for the local repository without breaking the calls to the Registry API. 
Upstream-commit: 31c66d5a00ee693a31902d1f75777dc9507c1416
Component: engine
 2013-07-08 17:26:50 -07:00
Sam Alba
9d31c1c68b It is now possible to include a ":" in a local repository name (it will not be the case for a remote name). This adds support for full qualified repository name in order to support private registry server 
Upstream-commit: e7d36c9590bfdc2e57cbbecce87729f51ac3b35f
Component: engine
 2013-07-08 17:22:41 -07:00
Sam Alba
a1649836a4 Changed the tag parsing to it will work even if there is a port in the repos registry url (full qualified name for pushing on a standalone registry) 
Upstream-commit: 3e8626c4a171653971aebcb778087c89c6c7ab67
Component: engine
 2013-07-08 17:20:41 -07:00
Guillaume J. Charmes
7664005559 Merge pull request #1157 from kstaken/1156-entrypoint-builder 
Builder: Fix #1156 entrypoint override from base image
Upstream-commit: e14dd4d33e2bbdb54f2bac31eb8eae155f9b656a
Component: engine
 2013-07-08 16:57:26 -07:00
Kimbro Staken
05fc4b9d83 Merge branch '1156-entrypoint-builder' of github.com:kstaken/docker into 1156-entrypoint-builder 
Upstream-commit: 87a69e67530555468462985833282b84608e6ef6
Component: engine
 2013-07-08 16:06:09 -07:00