Alexander Morozov
2711a9d3b2
Merge pull request #22631 from runcom/fix-leak-mount
...
pkg: chrootarchive: chroot_linux: fix mount leak
2016-06-13 09:29:46 -07:00
Yong Tang
85fa96aa57
Fix logrus formatting
...
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.
This fix fixes #23459 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-11 13:16:55 -07:00
Vincent Demeester
3ff8d449c4
Merge pull request #23458 from runcom/warnf
...
*: fix logrus.Warn[f]
2016-06-11 21:42:12 +02:00
Antonio Murdaca
3f69598101
*: fix logrus.Warn[f]
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-11 19:42:38 +02:00
Antonio Murdaca
375c8c3e4a
pkg: proxy: fix TCPEchoServer.Close() in unit test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-11 15:27:56 +02:00
Antonio Murdaca
f9023a4094
pkg: chrootarchive: chroot_linux: fix mount leak
...
When pivot_root fails we need to unmount the bind mounted path we
previously mounted in preparation for pivot_root.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-11 00:07:41 +02:00
fortinux
b33348682f
update peaceful zen
...
Signed-off-by: fortinux <info@fortinux.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-10 16:39:05 +02:00
Aleksa Sarai
e24aa430f9
pkg: archive: only ignore ENOTSUP when xattr fails
...
There might be other (valid) reasons for setxattr(2) to fail, so only
ignore it when it's a not supported error (ENOTSUP). Otherwise, bail.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-10 00:56:40 +10:00
Tibor Vass
9b79cbe713
Cleanup
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-06 15:57:51 -07:00
Alexander Morozov
a6496e5b41
ioutils: fix race in access closeErr in bytespipe
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-06 11:29:47 -07:00
Brian Goff
7ee212504d
Add support for volume scopes
...
This is similar to network scopes where a volume can either be `local`
or `global`. A `global` volume is one that exists across the entire
cluster where as a `local` volume exists on a single engine.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-05 15:37:15 -04:00
Brian Goff
f636807065
Enhance pluginrpc-gen parser
...
Now handles `package.Type` and `*package.Type`
Fixes parsing issues with slice and map types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-05 15:37:15 -04:00
Sven Dowideit
054469e284
Merge pull request #23193 from allencloud/fix-typos
...
use grep to find all a/an typos
2016-06-02 18:45:08 -07:00
Alexander Morozov
0b589d313d
pkg/parser/kernel: remove unused var block
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-02 10:50:36 -07:00
Alexander Morozov
f047280fee
Merge pull request #22549 from allencloud/make-pkg-parsers-support-darwin
...
add darwin support in package docker/pkg/parsers
2016-06-02 10:48:19 -07:00
Vincent Demeester
c453d36187
Merge pull request #23153 from AkihiroSuda/fix23152PkgGitutils
...
Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit
2016-06-02 17:21:38 +02:00
Sebastiaan van Stijn
4d6131b729
Merge pull request #22460 from jwhonce/wip/sigpipe
...
Ignore SIGPIPE events
2016-06-02 16:05:22 +02:00
allencloud
b4488c647b
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 17:17:22 +08:00
Akihiro Suda
3b183da509
Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit
...
Fix #23152
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-02 17:44:09 +09:00
allencloud
dadbfbe65a
make pkg/parsers support darwin and solaris
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 11:47:27 +08:00
Brian Goff
83be58f17e
Merge pull request #23151 from AkihiroSuda/fix23012PkgAuth
...
Fix racy tests in pkg/authorization
2016-06-01 20:45:54 -04:00
Akihiro Suda
d42424ca76
Fix racy tests in pkg/authorization
...
Fix #23012
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-01 03:25:56 +00:00
Akihiro Suda
dbb2000590
Fix pkg/streamformatter.TestJSONFormatProgress
...
The test was failing if the terminal column width is <= 110.
Addendum to #23113
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-31 09:09:06 +00:00
Lei Jitang
ed9647689d
Merge pull request #23113 from AkihiroSuda/fixTIOCGWINSZ23112
...
Fix pkg/jsonmessage.TestProgress panic
2016-05-31 14:58:55 +08:00
Alexander Morozov
c8ac41d83b
Merge pull request #23038 from AkihiroSuda/fixPkgDirectoryFilepathWalk
...
Fix filepath.Walk misusage in pkg/directory
2016-05-30 22:18:56 -07:00
Akihiro Suda
1f289f107d
Fix pkg/jsonmessage.TestProgress panic
...
Fix #23112
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-31 04:19:00 +00:00
Akihiro Suda
96b793f2a7
Fix filepath.Walk misusage in pkg/directory
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-30 07:40:46 +00:00
Darren Shepherd
4bc4f9c4c8
Change insane to infallible
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2016-05-28 09:49:34 -07:00
Brian Goff
bea302ebdd
Merge pull request #23041 from AkihiroSuda/fixPkgDiscoveryKvTestTooShortSleep
...
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
2016-05-27 21:11:33 -04:00
Arnaud Porterie
b5327c1c97
Merge pull request #22912 from duglin/FixImportTest
...
Fix docker import test
2016-05-27 14:03:44 -07:00
Akihiro Suda
7803ebf044
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-27 04:08:55 +00:00
Yong Tang
fb9132ae90
Inconsistent --tmpfs behavior
...
This fix tries to address the issue raised in #22420 . When
`--tmpfs` is specified with `/tmp`, the default value is
`rw,nosuid,nodev,noexec,relatime,size=65536k`. When `--tmpfs`
is specified with `/tmp:rw`, then the value changed to
`rw,nosuid,nodev,noexec,relatime`.
The reason for such an inconsistency is because docker tries
to add `size=65536k` option only when user provides no option.
This fix tries to address this issue by always pre-progating
`size=65536k` along with `rw,nosuid,nodev,noexec,relatime`.
If user provides a different value (e.g., `size=8192k`), it
will override the `size=65536k` anyway since the combined
options will be parsed and merged to remove any duplicates.
Additional test cases have been added to cover the changes
in this fix.
This fix fixes #22420 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-26 19:28:18 -07:00
allencloud
aabf518e4e
make package docker/pkg/platform support darwin
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-26 11:10:29 +08:00
Alexander Morozov
cce0e16ce4
Merge pull request #22951 from Microsoft/jjh/ise2
...
Windows: run -it not crash in PowerShell ISE
2016-05-25 16:50:06 -07:00
John Howard
f790161afd
Windows: run -it not crash in ISE
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-25 09:50:18 -07:00
Brian Goff
db82c57898
Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace
...
Fix a race in pkg/integration.TestChannelBufferTimeout
2016-05-25 11:35:23 -04:00
Akihiro Suda
9d9fe33067
Fix a race in pkg/integration.TestChannelBufferTimeout
...
Update #22965
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-25 07:09:38 +00:00
Akihiro Suda
6b20c0a9d7
Fix a race in pkg/discovery/memory
...
Fix #22964
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-25 04:01:43 +00:00
Brian Goff
c6179c0b10
Merge pull request #22925 from jstarks/fix_integration_test
...
pkg/integration: Port tests to Windows
2016-05-24 17:31:43 -04:00
John Starks
b65c85629c
pkg/integration: Port tests to Windows
...
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-05-24 12:12:48 -07:00
Amit Krishnan
a531a67461
Get the Docker Engine to build clean on Solaris
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-05-23 16:37:12 -07:00
Doug Davis
b191e3b70b
Fix docker import tests
...
For me when I run the test I see:
```
Downloading from http://nourl/bad
Importing 283 B
Untar re-exec error: exit status 1: output: unexpected EOF
```
and nothing about "dial tcp" so it appears that the output is
system dependent and therefore we can't really check it. I think
checking for non-zero exit code is sufficient so I'm removing this
string check.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-23 15:34:40 -07:00
Jhon Honce
0368021a2f
Ignore SIGPIPE events, resolves #19728
...
Using golang 1.6, is it now possible to ignore SIGPIPE events on
stdout/stderr. Previous versions of the golang library cached 10
events and then killed the process receiving the events.
systemd-journald sends SIGPIPE events when jounald is restarted and
the target of the unit file writes to stdout/stderr. Docker logs to stdout/stderr.
This patch silently ignores all SIGPIPE events.
Signed-off-by: Jhon Honce <jhonce@redhat.com>
2016-05-23 15:26:41 -07:00
Sebastiaan van Stijn
d97f6ab5f1
Merge pull request #22875 from Microsoft/jjh/nativeconsoleon
...
Windows: Turn on native console by default
2016-05-23 21:19:54 +02:00
John Howard
f25ade22d4
Windows: Default to Hyper-V Containers on client
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-21 11:29:53 -07:00
John Howard
998860f573
Windows: Turn on native console by default
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-20 19:19:26 -07:00
Vincent Demeester
8f9c5000e6
Merge pull request #22588 from runcom/fix-authz-tests
...
pkg: authorization: cleanup tests
2016-05-13 10:29:45 +02:00
Alexander Morozov
8aacbb6191
Merge pull request #22698 from cpuguy83/22612_fix_map_access
...
Fix concurrent map access in bytespipe
2016-05-12 11:51:54 -07:00
Brian Goff
1d2a9f2ace
Fix concurrent map access in bytespipe
...
When getting and returning a buffer, need to make sure to syncronize
access to the pools map.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-12 10:04:05 -04:00
Arnaud Porterie
55390c9822
Merge pull request #22353 from Microsoft/jjh/dockercp
...
Windows: docker cp platform semantically consistent paths
2016-05-11 13:08:24 -10:00