toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,634 Commits 3 Branches 295 Tags
e740d4f911781f2dc0127f1663de238d109efd2d
Commit Graph
22634 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 964f8b63bd Add pkg/parsers/architecture and pkg/platform 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
 2015-11-14 23:03:02 +01:00
Olle Jonsson 3e0bec1370 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 4e8fcd40028ed09b139b6f86954e676a1839be9c
Component: engine
 2015-11-14 22:21:45 +01:00
Vincent Demeester 6acf716496 Merge pull request #17009 from azurezk/user-checkers 
add c.Assert in docker_cli_ps_test.go
Upstream-commit: 31a6e01f4772bb9f385254e0731a9f06c7e6ef49
Component: engine
 2015-11-14 20:22:15 +01:00
John Howard ffe3114f57 Windows: Fix regresion on first boot 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8da449055fd2fb60e45391c8482865dca3d0232f
Component: engine
 2015-11-14 11:06:19 -08:00
Alexander Morozov 42d5166bfc Merge pull request #17758 from rhatdan/dynbinary 
Since default is dynbinary we should test with dynbinary
Upstream-commit: fb77b822ad2bb5d097ebd19a6ad4825b967a52ab
Component: engine
 2015-11-14 10:54:03 -08:00
Jessica Frazelle 8d0649a213 correct ltdl for centos 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 41619f4a902927767d149524b45d23ab9569636b
Component: engine
 2015-11-14 08:50:58 -08:00
Antonio Murdaca 6f1a30b2e2 Merge pull request #17851 from Microsoft/10662-ArgumentEscaping 
Prevent double escaping of Dockerfile commands on Windows
Upstream-commit: ad8a66573c61483b9a0721470438dfc8bd01993f
Component: engine
 2015-11-14 17:25:53 +01:00
Arnaud Porterie 2b045a190b Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration 
New version of notary with pkcs11 client integration
Upstream-commit: 7a6f2cdeeb88f340649a459697f79548759767dd
Component: engine
 2015-11-14 12:03:29 +01:00
Dan Walsh dd78f03b3f Since default is dynbinary we should test with dynbinary 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 0d47b74a7f3f42640d0714b651417415461b1b8c
Component: engine
 2015-11-14 06:01:55 -05:00
Anil Belur d096521f7f Adding test for the fix #17168. 
The test case creates a mount point, starts the daemon with the
graph dir pointing to the mount and initates a pull request. We should
be able to check for the error message when the mount point gets filled
during pull.

Signed-off-by: Anil Belur <askb23@gmail.com>
Upstream-commit: 4699ef8f87cc270fdf9e18bad5582b6696d56fe4
Component: engine
 2015-11-14 16:24:45 +05:30
Anil Belur 5ad61db1c1 Fix for #17168 misleading pull error 
This fix avoids overwritting the previous error messages, ensures the client gets the correct error messages and not just the most recent message during the pull request.
For this `var lastErr` replaced with a slice which acts as a temp place holder for the list of returned error messages for every attempt.
The slice is later joined and returned to the caller function after searching for the image with diffirent versions(v2,v1,v0).

Updated the code with check for no space left on device error occurance and prevent the
daemon on falling back to v1,v0.

Incorporated the comments from @calavera, @RichardScothern, @cpuguy83

Signed-off-by: Anil Belur <askb23@gmail.com>
Upstream-commit: 31cdc63419a29badad2d79590db83fe617ee8e03
Component: engine
 2015-11-14 16:24:45 +05:30
Antonio Murdaca a1e14407db Merge pull request #17971 from narqo/simplify-addr-formating 
Simplify final address formatting in parser.ParseTCPAddr
Upstream-commit: 1448cd3ec26ba98d4a0d53ff02a987ddab80939d
Component: engine
 2015-11-14 08:38:09 +01:00
Antonio Murdaca 0179308537 Merge pull request #17211 from endocode/kayrus/docker_fd_https 
Added possibility to use TLS with systemd socket activation
Upstream-commit: dc136b710b70a51510726576761f7bf9aa2455e2
Component: engine
 2015-11-14 08:36:54 +01:00
Anusha Ragunathan 666ae52a68 Fix devmapper backend in docker info 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: fdc2641c2b329c48cf1d1c8c0b806bec8784b3e0
Component: engine
 2015-11-13 21:05:47 -08:00
Srini Brahmaroutu cf05bcf15c Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z. 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6
Component: engine
 2015-11-14 03:16:45 +00:00
Michael Crosby bab21d6431 Merge pull request #17859 from liusdu/remove-rebundent 
remove unnecessary logs from daemon
Upstream-commit: 1f53bf90972141bc6f5888fb3520dbc68ff9ed14
Component: engine
 2015-11-13 16:45:30 -08:00
Michael Crosby c61ecf4a61 Merge pull request #17976 from Microsoft/jjh/store-test-unit 
Windows: Pass store test-unit
Upstream-commit: 7e0a5398af780669684b3c879542df0cc9126114
Component: engine
 2015-11-13 16:26:17 -08:00
Alexander Morozov 0192144f1d Merge pull request #17503 from mikebrow/fix-for-rmi-id-old-local-repositories 
putting in support for rmi id for legacy docker.io/name images in loc…
Upstream-commit: 9b307fe369884220fdbd3540562ede9050754e6b
Component: engine
 2015-11-13 16:22:30 -08:00
Michael Crosby b80faeb568 Merge pull request #17977 from Microsoft/jjh/archivewindowscomment 
Windows: Fixes comment in archive_windows.go
Upstream-commit: 439633cee63dd77c45348b57b4ec7e1332c6206f
Component: engine
 2015-11-13 16:00:14 -08:00
Michael Crosby eeed6c7d1f Merge pull request #17978 from Microsoft/jjh/removevolumecheck 
Windows: Remove check for volume support
Upstream-commit: 28612c558729a01f6d57d648436913a7055bbc14
Component: engine
 2015-11-13 15:59:41 -08:00
Michael Crosby 040ce59c2f Merge pull request #17979 from Microsoft/jjh/tidytodowindows 
Remove 'TODO Windows' unnecessary comment
Upstream-commit: 58244392e5e42bfa13114ff2cec60ef176ec173f
Component: engine
 2015-11-13 15:59:06 -08:00
unclejack d91b38c0d5 Merge pull request #17877 from aaronlehmann/capped-bytespipe 
Cap the amount of buffering done by BytesPipe
Upstream-commit: 13963957ebadc663915aed8c61451a93db41c27c
Component: engine
 2015-11-14 00:51:11 +02:00
Alexander Morozov 5113a5250e Merge pull request #17980 from Microsoft/jjh/configuresysinit 
Remove uncalled configureSysInit
Upstream-commit: 5e2d4aaec22cd09e823ee976202515ac992dec20
Component: engine
 2015-11-13 14:30:03 -08:00
Alexander Morozov aac6b83468 Merge pull request #17090 from duglin/dockerignoreWildcards 
Support multi-dir wildcards in .dockerignore
Upstream-commit: f5e318a17b8bd3126281add5e82dfb09be5b8f11
Component: engine
 2015-11-13 14:29:34 -08:00
Doug Davis 8fdcec54ee Merge pull request #17599 from perhapszzy/master 
Add line information in the parsed Dockerfile.
Upstream-commit: a5f3ed4801dd48bec96d96f63a1c5099bd75a2a6
Component: engine
 2015-11-13 16:53:59 -05:00
Doug Davis 775e6c0f07 Support multi-dir wildcards in .dockerignore 
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eddb14a44eb3ca6ba0b5e6906e21d767eba1af86
Component: engine
 2015-11-13 13:44:07 -08:00
John Howard a0d620ddb8 Remove uncalled configureSysInit 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2648655a4a0aaf41e02dec4064c5b6e68fa7b9fe
Component: engine
 2015-11-13 13:43:09 -08:00
David Lawrence 1c03807ac5 fixing tests for updated CLI output 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 52021ac2a4f2b32a6ad7444b182b569c616e500e
Component: engine
 2015-11-13 13:20:55 -08:00
Jessica Frazelle 2672323db9 update for mac 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6c818f3e5f1bb4966c8fb54aa0c412360c9094fe
Component: engine
 2015-11-13 13:20:54 -08:00
Jessica Frazelle 08e6893ada update debs/rpms for pkcs11 yubikey things 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
 2015-11-13 13:20:53 -08:00
Jessica Frazelle c3491d2f3b add buildtag pkcs11 to experimental 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 141369457ffaeee79154f4b649525f5c8b3d5f2e
Component: engine
 2015-11-13 13:20:49 -08:00
Jessica Frazelle d684c37400 update vendor.sh and notary api for vendored changes 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 94ea6af8cd1cd1d4106579ecf972a74f144e43c8
Component: engine
 2015-11-13 13:19:11 -08:00
Jessica Frazelle e326b386f5 update notary vendors 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a52a7a6991427f7f1db63755bf5a1cc09b105bd5
Component: engine
 2015-11-13 13:19:09 -08:00
John Howard 0c8ae9b87a Remove TODO Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 208ad80605e5c8c48f77f1b89b25951767135224
Component: engine
 2015-11-13 13:07:27 -08:00
John Howard c7ef5afd48 Windows: Remove check for volume support 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 820957198299a9fa7cbb019b2b0d3dc8c3b375d0
Component: engine
 2015-11-13 13:02:30 -08:00
John Howard a7cde865c9 Windows: Fixes comment 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e5261d6e4a1e96d4c0fa4b4480042046b695eda1
Component: engine
 2015-11-13 12:51:05 -08:00
perhapszzy@sina.com 900e412d74 Add line information in the parsed Dockerfile 
Signed-off-by: perhapszzy@sina.com <perhapszzy@sina.com>
Upstream-commit: 5b6c4dd3df4d501018268d5c32bf78380923c292
Component: engine
 2015-11-13 15:41:12 -05:00
John Howard 82dda06a38 Windows: Pass store test-unit 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 32b905d90ff133c92bb0dd89207a68c45fc81bbd
Component: engine
 2015-11-13 12:39:43 -08:00
Alexander Morozov d89963cfd4 Merge pull request #16920 from mountkin/fix-attach-test 
fix the flaws in the test of the attach API
Upstream-commit: 4302c14a647570ec4e037ecacc920e59fdeec41a
Component: engine
 2015-11-13 12:05:22 -08:00
Alexander Morozov 3898bf4aaf Merge pull request #17615 from WeiZhang555/17404-net-inspect-name 
Include container names in `network inspect`
Upstream-commit: a4acb1db4ae899e5b331b4b2724bda990e6f1371
Component: engine
 2015-11-13 11:54:59 -08:00
Alexander Morozov 1a8e0677b9 Merge pull request #17417 from cpuguy83/15815_add_log_file_poller 
Fallback to file polling for jsonlog reader on err
Upstream-commit: 42fa8e31284c76f485bed81ed2e1327d60e5cb13
Component: engine
 2015-11-13 11:49:54 -08:00
Darren Stahl f06cbc085f This fixes the case where arguments are escaped twice from Dockerfiles on 
Windows

Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 9db5db1b94bc1000d151315851096dcc6cd3512d
Component: engine
 2015-11-13 10:43:06 -08:00
Mary Anthony 914d3208ce Fixing issue noted by user 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0a316477802466c50a66d165f3f9c2e4c827675e
Component: engine
 2015-11-13 10:28:51 -08:00
moxiegirl 41bc75b63d Merge pull request #17961 from pidster/add-weave-network-plugin 
Add Weave Network Plugin to docs/extend/plugins.md
Upstream-commit: f49fb0708629c175d19c14558b9f9c091c71a291
Component: engine
 2015-11-13 10:12:58 -08:00
Alexander Morozov e628862038 Merge pull request #16873 from coolljt0725/expand_docker_info 
Add more cgroup config to docker info
Upstream-commit: cccf6749431b5055e01f824f1d479ab517e1f812
Component: engine
 2015-11-13 09:37:06 -08:00
Vladimir Varankin e6bfd3b818 Simplify address formating 
Use `net.JoinHostPort()` which count IPv6 literals in `host`,
instead of relying on `net.ParseIP(host).To4()` side effects.

Signed-off-by: Vladimir Varankin <nek.narqo@gmail.com>
Upstream-commit: 38303597452719fe4942c45a03783a9299235e1b
Component: engine
 2015-11-13 20:32:32 +03:00
Antonio Murdaca 615bc2a933 Merge pull request #17955 from twhiteman/issue_17952 
integration-cli: support remote docker host that uses TLS - fixes #17952
Upstream-commit: c705be8e229463caf466c5e6b7df9c9826ac6848
Component: engine
 2015-11-13 18:26:32 +01:00
Alexander Morozov 0894666dd3 Merge pull request #17833 from rhatdan/signals 
Define all of the signals defined by kill -l
Upstream-commit: 59a341ed2a875d3c46325f34abba59facc29f1f9
Component: engine
 2015-11-13 09:03:51 -08:00
kayrus cf625298ac Added possibility to use TLS with systemd socket activation 
Signed-off-by: kayrus <kay.diam@gmail.com>
Upstream-commit: 0f2b3191d9e4f48b1915e2da4acc4f28b0d71494
Component: engine
 2015-11-13 17:01:23 +01:00
Mike Brown 2f6a89e161 modifying docker --since and --until to support nanoseconds and time zones 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: 430d8ff6113e41edc4605267081fa424a9bfe19f
Component: engine
 2015-11-13 09:56:15 -06:00