allencloud
b4488c647b
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 17:17:22 +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
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
Alexander Morozov
9bcc9e6dc2
pkg/proxy: remove unused 'transfered' variable
...
That simplified code a bit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-05-10 14:33:21 -07:00
Antonio Murdaca
3c6c907299
pkg: chrootarchive: chroot_linux: fix docker build
...
The path we're trying to remove doesn't exist after a successful
chroot+chdir because a / is only appended after pivot_root is
successful and so we can't cleanup anymore with the old path.
Also fix leaking .pivot_root dirs under /var/lib/docker/tmp/docker-builder*
on error.
Fix https://github.com/docker/docker/issues/22587
Introduced by https://github.com/docker/docker/pull/22506
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-10 00:42:49 +02:00
Antonio Murdaca
e2b595b73b
pkg: authorization: cleanup tests
...
- do use use log pkg
- do not t.Fatal in goroutine
- cleanups
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-08 14:18:38 +02:00
Vincent Demeester
8a7fc5c59d
Merge pull request #21889 from cpuguy83/logscmd_add_attrs
...
Add support for reading logs extra attrs
2016-05-07 20:26:33 +02:00
Brian Goff
d0200e7fea
Add support for reading logs extra attrs
...
The jsonlog logger currently allows specifying envs and labels that
should be propagated to the log message, however there has been no way
to read that back.
This adds a new API option to enable inserting these attrs back to the
log reader.
With timestamps, this looks like so:
```
92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello
```
The extra attrs are comma separated before the log message but after
timestamps.
Without timestaps it looks like so:
```
foo=bar,hello=world hello
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-06 20:42:20 -04:00
John Howard
f82207f676
Windows: docker cp consistent paths
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-06 16:08:53 -07:00
unclejack
0952574563
Merge pull request #22506 from cpuguy83/no_chroot
...
Use pivot_root instead of chroot for chrootarchive
2016-05-06 14:21:23 -07:00
Doug Davis
eec2fd15f8
Merge pull request #22550 from allencloud/fix-typos
...
fix typos in comments
2016-05-06 08:56:33 -04:00
allencloud
a658947af4
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-06 18:23:11 +08:00
Vincent Demeester
208beb82e0
Merge pull request #21015 from cpuguy83/add_opaque_mount_id
...
When calling volume driver Mount, send opaque ID
2016-05-05 18:00:15 +02:00
Brian Goff
7db6117c8e
Use pivot_root instead of chroot for chrootarchive
...
This fixes one issue with Docker running under a grsec kernel, which
denies chmod and mknod under chroot.
Note, if pivot_root fails it will still fallback to chroot.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-04 19:55:34 -04:00
Anuj Bahuguna
73d751590c
Adding Rita Levi-Montalcini and Claude Shannon to name generator
...
Signed-off-by: Anuj Bahuguna "anujbahuguna.dev@gmail.com"
Signed-off-by: Anuj Bahuguna <abahuguna@fiberlink.com>
2016-05-04 00:14:09 +05:30
Phil Estes
9bde837926
Add Joan & Samuel Curran, Welsh scientest and Irish physicist couple
...
In honor of Betty Junod's cast, and her tweet about Joan Curran:
https://twitter.com/BettyJunod/status/727194712956784641
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2016-05-02 14:50:16 -04:00
Liron Levin
34a890ec58
Fix authorization issue - when request is denied return forbbiden exist code (403).
...
- Return 403 (forbidden) when request is denied in authorization flows
(including integration test)
- Fix #22428
- Close #22431
Signed-off-by: Liron Levin <liron@twistlock.com>
2016-05-02 19:14:48 +03:00
Brian Goff
ac615c51ba
When calling volume driver Mount, send opaque ID
...
This generates an ID string for calls to Mount/Unmount, allowing drivers
to differentiate between two callers of `Mount` and `Unmount`.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-29 09:37:02 -04:00
Brian Goff
d4db263aa4
Merge pull request #21613 from wzyboy/support-unixgram-syslog-address
...
Support unixgram syslog address
2016-04-28 11:06:17 -04:00
Zhuoyun Wei
0554f41c13
Support unixgram syslog address
...
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs
Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
2016-04-28 11:04:50 +08:00
John Starks
d7a00d191f
Windows: revendor Azure/go-ansiterm
...
go-ansiterm was previously pulling the testing package into the docker
binaries.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-25 15:57:59 -07:00
Tonis Tiigi
9333729a55
Safer file io for configuration files
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-21 11:31:15 -07:00
Vincent Demeester
6bf8399fb2
Merge pull request #22203 from alimate/name-gen-patch
...
Added Lamport & Agnesi to the list of scientists
2016-04-20 21:03:18 +02:00