Vincent Demeester
9bc62e6031
Merge pull request #20872 from duglin/Issue20470
...
Optimize .dockerignore when there are exclusions
2016-03-04 09:45:19 +01:00
David Calavera
b7bc1ce1a4
Merge pull request #20730 from clnperez/sysinfo-match-ip-case
...
Match case for IP variables in sysinfo pkg
2016-03-03 08:48:57 -08:00
Doug Davis
842b8d8784
Optimize .dockerignore when there are exclusions
...
Closes #20470
Before this PR we used to scan the entire build context when there were
exclusions in the .dockerignore file (paths that started with !). Now we
only traverse into subdirs when one of the exclusions starts with that dir
path.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2016-03-03 05:46:24 -08:00
Sebastiaan van Stijn
174959e8bf
Merge pull request #20896 from Microsoft/jjh/unit-pkg-integration
...
Windows CI: Turn off failing unit tests pkg\integration
2016-03-03 10:41:21 +01:00
Sebastiaan van Stijn
df1941bf0e
Merge pull request #20894 from Microsoft/jjh/unit-pkg-graphdb
...
Windows CI: Turn off failing unit tests pkg\graphdb
2016-03-03 10:40:22 +01:00
John Howard
5f2ba2b9ba
Windows CI: Turn off failing unit tests pkg\integration
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-03-02 19:37:18 -08:00
John Howard
9f5984d93f
Windows CI: Turn off failing unit tests pkg\graphdb
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-03-02 19:27:41 -08:00
John Howard
3e78ad7be2
Windows CI: Turn off failing unit test pkg\fileutils
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-03-02 19:05:33 -08:00
Vincent Demeester
b18f9cc29b
Merge pull request #20833 from Microsoft/testunit-archive
...
Windows CI: Unit Tests stop running failing archive test
2016-03-02 08:53:11 +01:00
David Calavera
266a75ac22
Merge pull request #20842 from dongluochen/IPv6Support
...
Handle IPv6 entries in discovery
2016-03-01 21:03:37 -08:00
Dong Chen
7554e882df
Use net.JoinHostPort to handle address format.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-03-01 17:27:30 -08:00
Dong Chen
f7c9214e29
Handle IPv6 entries.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-03-01 16:56:12 -08:00
Darren Stahl
7f6ef09736
Windows CI: Unit Tests stop running failing chrootarchive tests
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-03-01 14:28:29 -08:00
Darren Stahl
f9cfc4c387
Windows CI: Unit Tests stop running failing archive test
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-03-01 13:27:44 -08:00
Tibor Vass
bcc59fc951
Merge pull request #20587 from MHBauer/termfixes
...
do not turn post-processing on for linux-cgo terminals
2016-03-01 11:37:26 -05:00
Christy Perez
5b3fc7aab2
Match case for variables in sysinfo pkg
...
I noticied an inconsistency when reviewing docker/pull/20692.
Changing Ip to IP and Nf to NF.
More info: The golang folks recommend that you keep the initials consistent:
https://github.com/golang/go/wiki/CodeReviewComments#initialisms .
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2016-03-01 10:37:05 -06:00
Vincent Demeester
dac18985fa
Merge pull request #20791 from Microsoft/jjh/testunit-pkgsymlink
...
Windows CI: Turning off pkg\symlink unit testing
2016-03-01 08:18:44 +01:00
Sebastiaan van Stijn
67b16c7381
Merge pull request #20782 from estesp/new-parent-dir-ownership
...
Fix ownership of non-existing parent dir
2016-03-01 01:45:38 +01:00
John Howard
eaa1708e70
Windows CI: Turning off pkg\symlink unit testing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-02-29 13:10:50 -08:00
Vincent Demeester
d878f512fd
Merge pull request #20492 from WeiZhang555/export-no-privilege
...
Clean redundant error message for export
2016-02-29 21:14:28 +01:00
David Calavera
a5d98b82ea
Merge pull request #20780 from runcom/revert-sudo-user
...
Revert sudo user
2016-02-29 11:48:24 -08:00
David Calavera
29b2b0c22b
Merge pull request #20686 from clintonskitson/bugfix/plugin_desc_leak
...
Fix plugin file descriptor leaks
2016-02-29 10:44:36 -08:00
Brian Goff
abbb16d7ab
Merge pull request #20602 from twistlock/20508_authz_plugin_corrupt_body
...
Fix #20508 - Authz plugin enabled with large text/JSON POST payload corrupts body
2016-02-29 10:43:02 -05:00
Phil Estes
7a61b9ae42
Fix ownership of non-existing parent dir
...
During "COPY" or other tar unpack operations, a target/destination
parent dir might not exist and should be created with ownership of the
root in the right context (including remapped root when user namespaces
are enabled)
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2016-02-29 09:14:23 -05:00
Antonio Murdaca
863b571617
Revert "resolve the config file from the sudo user"
...
This reverts commit afde6450ee .
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-02-29 13:51:43 +01:00
Brian Goff
ec268be52e
Merge pull request #20706 from calavera/remove_concurrent_access_to_stdtypes
...
Make stdcopy.StdWriter thread safe.
2016-02-27 21:14:09 -05:00
Clinton Kitson
799ae78b7e
Fixes plugin file descriptor leak on plugin discovery
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
2016-02-26 19:43:50 -08:00
David Calavera
443a5c2021
Make stdcopy.stdWriter goroutine safe.
...
Stop using global variables as prefixes to inject the writer header.
That can cause issues when two writers set the length of the buffer in
the same header concurrently.
Stop Writing to the internal buffer twice for each write. This could
mess up with the ordering information is written.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-02-26 16:51:18 -05:00
Antonio Murdaca
bf04d68db2
pkg: idtools: fix subid files parsing
...
Since Docker is already skipping newlines in /etc/sub{uid,gid},
this patch skips commented out lines - otherwise Docker fails to start.
Add unit test also.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-02-26 15:42:05 +01:00
David Calavera
6c35350bab
Merge pull request #20263 from Microsoft/jjh/testunit-fileutils
...
Windows CI: Fixes panic in test-unit for FileUtils
2016-02-25 17:35:32 -08:00
Vincent Demeester
61d24e769d
Merge pull request #20572 from runcom/sudo-user
...
resolve the config file from the sudo user
2016-02-25 16:05:25 +01:00
Liron Levin
ca5c2abecf
Fix #20508 - Authz plugin enabled with large text/JSON POST payload corrupts body
...
Based on the discussion, we have changed the following:
1. Send body only if content-type is application/json (based on the
Docker official daemon REST specification, this is the provided for all
APIs that requires authorization.
2. Correctly verify that the msg body is smaller than max cap (this was
the actual bug). Fix includes UT.
3. Minor: Check content length > 0 (it was -1 for load, altough an
attacker can still modify this)
Signed-off-by: Liron Levin <liron@twistlock.com >
2016-02-25 08:11:55 +02:00
Brian Goff
93ad9c31fc
Close resp body on plugin call error
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-24 20:09:51 -05:00
Brian Goff
f9524a4d24
add file poller panic fix from 1.10.2
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-24 10:17:29 -05:00
Antonio Murdaca
afde6450ee
resolve the config file from the sudo user
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-02-24 15:41:00 +01:00
Brian Goff
91fdfdd537
Revert "use pubsub instead of filenotify to follow json logs"
...
This reverts commit b1594c59f5 .
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-23 21:43:52 -05:00
Brian Goff
f78091897a
Revert "pkg: remove unused filenotify"
...
This reverts commit ee99b5f2e9 .
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-23 21:43:46 -05:00
Morgan Bauer
67629c8b52
do not turn post-processing on for linux-cgo term
...
- fixes #15373
- remove set OPOST output flag for termios
- remove latent os.Exit call
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2016-02-23 14:14:58 -08:00
John Howard
b368a9f9b7
Windows CI: Fixes panic in test-unit for FileUtils
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-02-23 13:31:45 -08:00
Stefan Weil
2eee613326
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de >
2016-02-22 20:27:15 +01:00
Zhang Wei
439433099e
Clean redundant error message for export
...
When execute `docker export -o path xxx` and path is a directory docker
has no privilege to write to, daemon will print lots of error logs that
most of them are duplicated and redundant.
This will remove unnecessary error logs and print only once.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-02-19 18:50:11 +08:00
Brian Goff
aae454cb52
Merge pull request #20292 from Microsoft/jjh/testunit-pkgarchivestep2
...
Windows CI: test-unit on pkg\archive part 2
2016-02-18 12:12:09 -05:00
David Calavera
9a81f206b3
Merge pull request #20408 from cpuguy83/use_pool_for_pubsub_wg
...
Use pool for pubsub `Publish`'s waitgroups
2016-02-17 14:46:13 -08:00
David Calavera
647d3266ea
Merge pull request #20260 from Microsoft/jjh/testunit-pkggitutils
...
Windows CI: Unit tests - port pkg\gitutils
2016-02-17 13:50:17 -08:00
Brian Goff
58d98f8288
Use pool for pubsub Publish's waitgroups
...
benchmark old ns/op new ns/op delta
BenchmarkPubSub-8 1036494796 1032443513 -0.39%
benchmark old allocs new allocs delta
BenchmarkPubSub-8 2467 1441 -41.59%
benchmark old bytes new bytes delta
BenchmarkPubSub-8 212216 187792 -11.51%
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-17 14:36:57 -05:00
Aleksa Sarai
ee99b5f2e9
pkg: remove unused filenotify
...
pkg/filenotify isn't used anymore and it causes problems with
hack/vendor.sh (nothing uses it, so hack/vendor.sh will remove the
vendored code).
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-02-18 00:11:43 +11:00
Phil Estes
5c78515430
Merge pull request #20366 from LK4D4/socks_proxy
...
Add support for forwarding Docker client through SOCKS proxy
2016-02-16 22:29:49 -08:00
Alexander Morozov
8545fdc6dd
Merge pull request #19498 from mountkin/refactor-jsonfilelog-reader
...
use pubsub instead of filenotify to follow json logs
2016-02-16 13:55:48 -08:00
Alexander Morozov
05002c2501
Add support for forwarding Docker client through SOCKS proxy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-02-16 11:09:28 -08:00
Shijiang Wei
1e0f1ec525
optimize pubsub.Publish function
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2016-02-15 19:25:21 +08:00