p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,919 Commits 2 Branches 295 Tags
2b248fd04439c54fc42a4696dc449c6ec0ef89d2
Commit Graph

12919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass
2b248fd044 Merge pull request #10487 from icecrime/racy_test_registry 
Fix race in test registry setup
Upstream-commit: fcdfc8ccc86044f06da0b47dc028894fe3ea25f9
Component: engine
 2015-01-31 15:47:09 -05:00
Arnaud Porterie
0820460272 Fix race in test registry setup 
Wait for the local registry-v2 test instance to become available to
avoid random tests failures.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: de8ea06d7dab7c5278f84728f7e0aa69e3301ad0
Component: engine
 2015-01-31 11:31:41 -08:00
Michael Crosby
bfe88881ca Merge pull request #10417 from jfrazelle/a-few-nit-picks 
Added tianon's info and changed a typo.
Upstream-commit: 18d8fe12494197773727c5d1a866e2d82d6e5602
Component: engine
 2015-01-30 17:32:12 -08:00
Fred Lifton
e80c3d3649 Merge pull request #10461 from estesp/fix-tls-docs 
Add missing `$HOST` in a couple places in HTTPS/TLS setup docs
Upstream-commit: dfbb3e322b8434f98f9f723b1fe751bbec045f11
Component: engine
 2015-01-30 17:25:29 -08:00
Arnaud Porterie
6dced16e35 Merge pull request #10469 from dmcgowan/v2-registry-push-fallback 
Add push fallback to v1 for the official registry
Upstream-commit: bb4d24de06e96efea180bee9761dfa181b6439b6
Component: engine
 2015-01-30 16:43:23 -08:00
Alexander Morozov
8751a1f5f8 Merge pull request #10465 from jfrazelle/tomlv 
Validate toml
Upstream-commit: b8d65183c3d6f03e39f36ec74638181633d27028
Component: engine
 2015-01-30 16:27:07 -08:00
Tibor Vass
85c251b61f Merge pull request #10394 from dmcgowan/v2-manifest-save-tarsum 
V2 manifest save tarsum
Upstream-commit: ee0b0464c692172c43735becbb00aae96f4f4c5e
Component: engine
 2015-01-30 18:22:50 -05:00
Jessica Frazelle
255fb9b1d6 Validate toml 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: d245a8a706558c4a66498cb8d1a1d8fe38dd67ee
Component: engine
 2015-01-30 15:22:11 -08:00
Alexander Morozov
2b170012a1 Merge pull request #10456 from dmcgowan/revert-client-signature 
Revert client signature
Upstream-commit: d8ad7c0edcf9f9a59df7180496abac8b4b5a3942
Component: engine
 2015-01-30 14:54:27 -08:00
Derek McGowan
1ca090efba Add push fallback to v1 for the official registry 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 7d62943178e803663b4939666377b75a21d3e537
Component: engine
 2015-01-30 14:37:44 -08:00
Derek McGowan
12b02aa7f6 Revert client signature 
Supports multiple tag push with daemon signature

Fixes #10444

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 403d981d70dc8a493a9a10be4b5d2e2ce871f380
Component: engine
 2015-01-30 14:20:32 -08:00
Michael Crosby
ea66003c5c Merge pull request #10460 from estesp/10387-setup-tcp-keepalive 
Setup TCP keep-alive on hijacked HTTP(S) client <--> daemon sessions
Upstream-commit: 1dc1b9345109549e619f207f4ecbc30605b4ebb6
Component: engine
 2015-01-30 11:31:31 -08:00
Michael Crosby
4a8b434df2 Merge pull request #9943 from gdi2290/update-authors 
Update AUTHORS file and .mailmap
Upstream-commit: 87fd6375f1ad6fc5c0bcea2f39c6a16d3f91d5da
Component: engine
 2015-01-30 09:59:31 -08:00
Josh Hawn
1a1db2c237 Remove Checksum field from image.Image struct 
The checksum is now being stored in a separate file beside the image
JSON file.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 3414307306dc1780f80c5ca5e9dd7a8822e27eec
Component: engine
 2015-01-30 09:37:50 -08:00
Tibor Vass
4ed88343d7 Merge pull request #10441 from brahmaroutu/enable_ibm_power_z 
Adding IBM Power and Z as valid platforms to the docker
Upstream-commit: 3b0326fc81bee04f0b40047be0f99f1b71a4de90
Component: engine
 2015-01-30 11:48:41 -05:00
Phil Estes
db0b8845b9 Add missing $HOST in a couple places in HTTPS/TLS setup docs 
Fix typos in setup docs where tcp://:2376 is used without the $HOST
parameter.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 6a1da678de2150a0dcf943614b6c1a1a2012ab38
Component: engine
 2015-01-30 11:20:50 -05:00
Srini Brahmaroutu
102f788964 Removing the check on Architecture to build and run Docker on IBM Power and Z platforms 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 7d7a002e51a1a1172f09741896f0a6c001438a49
Component: engine
 2015-01-30 16:16:17 +00:00
Phil Estes
9430b451d3 Setup TCP keep-alive on hijacked HTTP(S) client <--> daemon sessions 
Fixes #10387

Without TCP keep-alive set on socket connections to the daemon, any
long-running container with std{out,err,in} attached that doesn't
read/write for a minute or longer will end in ECONNTIMEDOUT (depending
on network settings/OS defaults, etc.), leaving the docker client side
believing it is still waiting on data with no actual underlying socket
connection.

This patch turns on TCP keep-alive for the underlying TCP connection
for both TLS and standard HTTP hijacked daemon connections from the
docker client, with a keep-alive timeout of 30 seconds.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: f73a6b3845a498107cfb22e4d962f0a30870e7c6
Component: engine
 2015-01-30 10:50:27 -05:00
James Turnbull
dcaf3c09c7 Merge pull request #10448 from jfrazelle/why-the-hell-are-we-sudoing-everything 
Some small updates to the dev env docs.
Upstream-commit: fb55c0ecc6e1694e13787928ccbb6bcbec17cd00
Component: engine
 2015-01-30 08:47:40 +01:00
Derek McGowan
7164984f64 Store tar checksum in separate file 
Fixes #10432

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: e9f6f1a930b74c6b06f257eac838d062bbdd0d16
Component: engine
 2015-01-29 21:28:20 -08:00
Michael Crosby
1ce0105104 Merge pull request #10449 from LK4D4/fix_race_monitor 
Remove explicit setting of ExitCode
Upstream-commit: 144ae9b0c70ace8eb2e0336c7a4f6c479774fda1
Component: engine
 2015-01-29 16:07:28 -08:00
Jessica Frazelle
d68f0eed0e Some small updates to the dev env docs. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 80b843b7313234f56ffd9881bd50a56d85b52e7f
Component: engine
 2015-01-29 16:01:05 -08:00
Jessie Frazelle
78452ce653 Merge pull request #10446 from dmcgowan/defer-key-file-creation 
Defer creation of trust key file until needed
Upstream-commit: d748ec31d5f89f4cbe363ac9b38310906bf2a9e0
Component: engine
 2015-01-29 15:23:35 -08:00
Michael Crosby
4ef991d58c Merge pull request #10445 from jlhawn/no_checksum_on_install 
No longer compute checksum when installing images.
Upstream-commit: 7b65de87710b8efb75df3eb5d7f11ffb92fbfa41
Component: engine
 2015-01-29 15:13:29 -08:00
Alexander Morozov
2a8e65c2bf Remove explicit setting of ExitCode 
That will be set in defer anyway. Also there was race between setting
ExitCode and inspect.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e7f6433109fad4762379aed88ae70da36805f198
Component: engine
 2015-01-29 14:50:42 -08:00
Josh Hawn
a2ae7e0198 No longer compute checksum when installing images. 
While checksums are verified when a layer is pulled from v2 registries,
there are known issues where the checksum may change when the layer diff
is computed again. To avoid these issues, the checksum should no longer
be computed and stored until after it has been extracted to the docker
storage driver. The checksums are instead computed lazily before they
are pushed to a v2 registry.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: e636df8d9637514e125afe7418a3b98e5270858f
Component: engine
 2015-01-29 13:52:59 -08:00
Derek McGowan
eb1117987a Defer creation of trust key file until needed 
Fixes #10442

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 0eed1f4d8da893d7c91be811197032a064053155
Component: engine
 2015-01-29 13:46:12 -08:00
Alexander Morozov
11ff60e249 Merge pull request #10430 from duglin/AddBuilderFolks 
Add builder folks to the top-level maintainers file
Upstream-commit: 8dbaed1d9630d8170e6ad464bb3344fc9049a7a6
Component: engine
 2015-01-29 13:32:56 -08:00
Fred Lifton
569feae573 Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs 
DHE documentation placeholder and Navbar changes
Upstream-commit: c12fb48a8a7df71ec3b952800ead1f21aea9ada6
Component: engine
 2015-01-29 10:23:57 -08:00
Fred Lifton
7d86677c51 Merge pull request #10293 from SvenDowideit/test-9952 
comment out the docker and curl lines we'll run later
Upstream-commit: 5b9b5aff06aa0e2c8397ee4cfb62e7f1ea249e0e
Component: engine
 2015-01-29 10:18:53 -08:00
Fred Lifton
dad1ed7610 Merge pull request #10428 from mehulkar/patch-1 
Improve explanation of port mapping from containers
Upstream-commit: 9e10a888a3d4c804eb4a2aebcf0467b8ae0e4076
Component: engine
 2015-01-29 10:07:24 -08:00
Mehul Kar
b5b158f395 Improve explanation of port mapping from containers 
Signed-off-by: Mehul Kar <mehul.kar@gmail.com>
Upstream-commit: f1bc02e91f79b4a54f47e0ad4abfd3d48b698ec4
Component: engine
 2015-01-29 09:09:44 -08:00
James Turnbull
69b545f6ad Merge pull request #10351 from duglin/FixDocsWorkdir 
Fix docs so WORKDIR mentions it works for COPY and ADD too
Upstream-commit: ba8e1673ad81f97d836acfdacbed5f4c54a0ef68
Component: engine
 2015-01-29 09:52:01 -05:00
Sven Dowideit
00303c7fa9 DHE documentation placeholder and Navbar changes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0ce3a49d64bcfd81823fe0e9bf54c51ddf6e35d4
Component: engine
 2015-01-29 20:50:43 +10:00
Alexander Morozov
e6f8a05595 Merge pull request #10433 from guoxiuyan/Fix_typo 
Fix a minor typo
Upstream-commit: d400ac756cae9c937089f9f20bcc75826e99ea67
Component: engine
 2015-01-28 20:57:35 -08:00
Doug Davis
afb2843935 Add builder folks to the top-level maintainers file 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 761a020f9dbb5e5610dce0dc8c762de09f8a0d46
Component: engine
 2015-01-28 18:32:38 -08:00
Tibor Vass
09a29b4b64 Merge pull request #10368 from jfrazelle/lingering-exec-test 
Move one last exec test :)
Upstream-commit: fb9363eb2a859684aefc46d5854f05ed02e74bcf
Component: engine
 2015-01-28 21:21:05 -05:00
guoxiuyan
5dbf91e768 Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
Upstream-commit: 07d190a61c60cff2f20186e700abca46f18d35ac
Component: engine
 2015-01-29 10:15:56 +08:00
James Turnbull
2fe4c8a4a6 Merge pull request #10142 from thaJeztah/docs-use-example-image 
Replace "base" with "debian" in API documentation
Upstream-commit: c9b03c6095baba37f2fb276459f30c29d156f427
Component: engine
 2015-01-28 20:40:02 -05:00
Sebastiaan van Stijn
65b792b36b Replace "base" with "ubuntu" in documentation 
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.

This changes the API documentation to use "ubuntu" in stead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c0969ed3d896c9add0a2cca7b9a9074cd138571b
Component: engine
 2015-01-28 22:54:10 +01:00
Michael Crosby
5946d2896a Merge pull request #10420 from tianon/ubuntu-version 
Update .deb version numbers to be more sane
Upstream-commit: b505db5e3c0b5ca60977e268572a05c499f4703c
Component: engine
 2015-01-28 13:50:12 -08:00
Tianon Gravi
44e00a8ff5 Update .deb version numbers to be more sane 
Example output:
```console
root@906b21a861fb:/go/src/github.com/docker/docker# ./hack/make.sh binary ubuntu
bundles/1.4.1-dev already exists. Removing.

---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev

---> Making bundle: ubuntu (in bundles/1.4.1-dev/ubuntu)
Created package {:path=>"lxc-docker-1.4.1-dev_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
Created package {:path=>"lxc-docker_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}

```

As noted in a comment in the code here, this sums up the reasoning for this change: (which is how APT and reprepro compare versions)
```console
$ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
true
```

ie, `1.5.0` > `1.5.0~rc1` > `1.5.0~git20150128.112847.17e840a` > `1.5.0~dev~git20150128.112847.17e840a`

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 0fab79f20343db9d95da191cf473651c3c8f5f42
Component: engine
 2015-01-28 14:26:40 -07:00
Tibor Vass
c60988becd Merge pull request #10123 from duglin/Issue10097 
Build CMD/ENTRYPOINT cache strings properly
Upstream-commit: 70fbd45a5c88f6f39a07b04f81a07721bf5f3eed
Component: engine
 2015-01-28 14:43:16 -05:00
Michael Crosby
55694ca80d Merge pull request #10416 from icecrime/update_fish_completion 
Update fish completion for 1.5.0
Upstream-commit: 17e840a47a7e65a96d53db1bbace43f59a4b1a31
Component: engine
 2015-01-28 10:28:47 -08:00
Arnaud Porterie
221da50df3 Merge pull request #10406 from estesp/fixup-ipv6-bridge-creation 
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
Upstream-commit: 45ef269498983d8068e214b521e7e0aa1db5ae4d
Component: engine
 2015-01-28 10:17:45 -08:00
Jessica Frazelle
05456cd924 Added tianon's info and changed a typo. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ef957f43518a8e636bca48604ebe02afdba775bd
Component: engine
 2015-01-28 09:54:48 -08:00
Jessie Frazelle
90f3a4705d Merge pull request #10398 from LK4D4/export_daemon_vars 
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
Upstream-commit: 13b646157099ccf7566afdefd58b98cd1f52ab99
Component: engine
 2015-01-28 09:44:39 -08:00
Arnaud Porterie
3665f098e8 Update fish completion for 1.5.0 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9cea20ffc5904201efdda2c8d6623759e15ad8eb
Component: engine
 2015-01-28 08:52:06 -08:00
Arnaud Porterie
942d5a9a17 Merge pull request #10372 from dmcgowan/v2-registry-buffer-push 
Buffer tar file on v2 push
Upstream-commit: 2cb82c11cf43df0590a803c8733a8e77be704b85
Component: engine
 2015-01-28 08:47:21 -08:00
Arnaud Porterie
250ef0009a Merge pull request #10357 from jfrazelle/bash-completion-stats 
Add completion for stats.
Upstream-commit: f23c136a951662d74d4e6a18a556aaaaffb9a102
Component: engine
 2015-01-28 08:29:06 -08:00