Commit graph

2054 commits

Author SHA1 Message Date
Michael Crosby
2c50035f93 Merge pull request #24717 from icaoweiwei/patch_2016-07-16_1
Add output of integer argument
2016-08-12 10:54:01 -07:00
Vincent Demeester
64f83cee43 Merge pull request #25568 from thaJeztah/enhance-string-truncate
Implement stringutils.Ellipsis()
2016-08-12 17:19:50 +02:00
Michael Crosby
3011a41d3f Merge pull request #25561 from allencloud/make-more-pkgs-support-darwin
make more pkgs support darwin
2016-08-11 14:17:57 -07:00
Sebastiaan van Stijn
51dc35cf23
Implement stringutils.Ellipsis()
This patch implements an Ellipsis utility to
append an ellipsis (...)  when truncating
strings in output.

It also fixes the existing Truncate() utility
to be compatible with unicode/multibyte characters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-11 14:14:06 +02:00
Alexander Morozov
64605d709f Merge pull request #23951 from allencloud/defer-os-file-close
add defer file.Close to avoid potential fd leak
2016-08-10 11:07:15 -07:00
allencloud
bd11a269bc make more pkgs support darwin
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-10 22:56:05 +08:00
allencloud
0ead624473 add defer file.Close to avoid potential fd leak
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-10 08:36:09 +08:00
Sebastiaan van Stijn
91853e44ae Merge pull request #25415 from avaid96/exitret
added functionality to interrupt the terminal when it is waiting for …
2016-08-09 16:47:54 +02:00
Vincent Demeester
b2b3cb7be9 Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
Enable to dynamically reload authorization plugins via daemon.config
2016-08-05 19:38:40 +02:00
Avi Vaid
c4b07f4683 added functionality to interrupt the terminal when it is waiting for an input
Signed-off-by: Avi Vaid <avaid1996@gmail.com>
2016-08-04 10:00:02 -07:00
Sebastiaan van Stijn
87e48ecd04 Merge pull request #23497 from shishir-a412ed/dm_task_run_failed
Fixes Issue # 23418: Race condition between device deferred removal and resume device.
2016-08-03 21:54:33 +02:00
Sebastiaan van Stijn
b47df1ddbe Merge pull request #25105 from hqhq/fix_kmem_test
Fix TestUpdateKernelMemoryUninitialized on new kernel version
2016-08-02 17:15:53 +02:00
Shishir Mahajan
0e633ee14a Fixes Issue # 23418: Race condition between device deferred removal and resume device.
Problem Description:

An example scenario that involves deferred removal
1. A new base image gets created (e.g. 'docker load -i'). The base device is activated and
mounted at some point in time during image creation.
2. While image creation is in progress, a privileged container is started
from another image and the host's mount name space is shared with this
container ('docker run --privileged -v /:/host').
3. Image creation completes and the base device gets unmounted. However,
as the privileged container still holds a reference on the base image
mount point, the base device cannot be removed right away. So it gets
flagged for deferred removal.
4. Next, the privileged container terminates and thus its reference to the
base image mount point gets released. The base device (which is flagged
for deferred removal) may now be cleaned up by the device-mapper. This
opens up an opportunity for a race between a 'kworker' thread (executing
the do_deferred_remove() function) and the Docker daemon (executing the
CreateSnapDevice() function).

This PR cancel the deferred removal, if the device is marked for it. And reschedule the
deferred removal later after the device is resumed successfully.

Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-08-02 10:33:58 -04:00
Qiang Huang
da5d66fb70 Fix TestUpdateKernelMemoryUninitialized on new kernel version
Fixes: #25073

Update kernel memory on running containers without initialized
is forbidden only on kernel version older than 4.6.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-02 13:17:20 +08:00
Stefan J. Wernli
d0b9c33f71 Revert "Add checking err for IsWindowsClient()"
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-08-01 17:33:41 -07:00
Sebastiaan van Stijn
f2fb28cbb3 Merge pull request #25294 from klinden/patch-1
adding entry for Hugh Beaver
2016-08-02 01:01:13 +02:00
Kyle Linden
653d083c1e Add entries for Hugh Beaver, Lois Haibt and some more adjectives
Signed-off-by: Kyle Linden <kyle.linden@appliedis.com>
2016-08-01 16:05:27 -04:00
Sebastiaan van Stijn
d2eb5dc9e0 Merge pull request #24821 from thaJeztah/stringid-refactor
Minor refactor and beter coverage for pkg/stringid
2016-08-01 21:12:14 +02:00
allencloud
a91f59d487 make pkg pidfile support darwin
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-01 22:01:20 +08:00
Sebastiaan van Stijn
4554e60651 Merge pull request #25066 from lixiaobing10051267/masterErr
Add checking err for IsWindowsClient()
2016-07-30 17:25:08 +01:00
Liron Levin
4192fe9c06 Enable to dynamically reload authorization plugins via daemon.config
Following #22729, enable to dynamically reload/remove the daemon
authorization plugins (via standard reloading mechanism).
https://docs.docker.com/engine/reference/commandline/daemon/#daemon-
configuration-file

Daemon must store a reference to the authorization middleware to refresh
the plugin on configuration changes.

Signed-off-by: Liron Levin <liron@twistlock.com>
2016-07-30 14:59:07 +03:00
Sebastiaan van Stijn
1e6fd0378b Merge pull request #24081 from Microsoft/jjh/signaltofile
Windows: Stack dump to file
2016-07-29 22:09:35 +02:00
Alexander Morozov
170abb5f7c Merge pull request #24745 from daehyeok/logrus
Refactoring for logrus formatting
2016-07-28 16:50:19 -07:00
lixiaobing10051267
1df9f0932e Modify func name from TestChtimes to TestChtimesLinux
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Modify func note

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-07-27 10:05:59 +08:00
Brian Goff
bb27d017f3 Merge pull request #25086 from dmcgowan/overlay2-fix-sub-directory-whiteouts
Fix overlay2 sub directory whiteouts
2016-07-26 20:45:41 -04:00
Derek McGowan
1c0f6653ba Fix files in subdirectories creating bad whiteout
Closes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-26 12:03:55 -07:00
lixiaobing10051267
b4833e3b3d add to check err
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-07-26 21:43:32 +08:00
Akihiro Suda
b1e71bdd1d Fix pkg/plugins TLSConfig panic
Fix #25046

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-07-26 08:53:54 +00:00
Vincent Demeester
bff9a0556f Merge pull request #24961 from jstarks/vt_th2_fix
Windows: Restore console mode on set mode failure
2016-07-25 09:49:34 +02:00
Vincent Demeester
1f3b400d3c Merge pull request #24977 from lixiaobing10051267/masterNote
Modify several fun notes in fsnotify.go
2016-07-25 09:41:17 +02:00
Vincent Demeester
40044cb18f Merge pull request #24963 from allencloud/fix-typos
fix typos
2016-07-25 09:39:48 +02:00
lixiaobing10051267
ff2c898652 Modify several fun notes in fsnotify.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-07-24 13:35:33 +08:00
lixiaobing10051267
d6556a6ef7 Func name wrong in notes of response.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-07-23 16:03:27 +08:00
allencloud
4e959ef2f7 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-23 11:32:23 +08:00
John Starks
83c186fdd4 Windows: Restore console mode on set mode failure
SetConsoleMode() on input handles appears to remember invalid bits that
were set, causing problems for other programs (such as xcopy.exe) trying
to set the console mode after docker.exe has exited. Always restore
the input console mode on set failure.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-07-22 18:34:15 -07:00
John Howard
b63c92bf24 Windows: Stack dump to file
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-07-21 20:04:47 -07:00
Sebastiaan van Stijn
78eab14d0b
Minor refactor and beter coverage for pkg/stringid
This slightly simplifies TruncateID() by only
trimming the string if needed.

Also improved unit-tests for this package;

- Add a test for GenerateNonCryptoID()
- Add a test for shortening a sha-256 ID
- Make TestShortenId() more "unit", by using a fixed string, instead of calling GenerateRandomID()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 00:23:06 +02:00
Vincent Demeester
6875f71d7c Merge pull request #24776 from anusha-ragunathan/plugins-connect
Add only legacy plugins to the legacy lookup map.
2016-07-19 17:11:50 +02:00
Doron Podoleanu
6bec735c91 Use const http status code instead of just numbers see #24783
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-07-19 10:40:20 +03:00
Tibor Vass
e6a97db2c9 Merge pull request #23878 from jstarks/fix_windows_console
Windows: Always enable VT emulation
2016-07-18 16:23:04 -07:00
Anusha Ragunathan
8fd779dc28 Add only legacy plugins to the legacy lookup map.
Legacy plugin model maintained a map of plugins. This is
not used by the new model. Using this map in the new model
causes incorrect lookup of plugins. This change uses adds
a plugin to the map only if its legacy.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-18 15:43:44 -07:00
Daehyeok Mun
6a1183b3ae Refactoring for logrus formatting
Use module name logrus instead of log.
Use logrus.[Error|Warn|Debug|Fatal|Panic|Info]f instead of w/o f

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-07-18 12:53:34 -06:00
Arnaud Porterie
98a4b3e332 Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
2016-07-18 16:05:46 +00:00
Cao Weiwei
9be8bf0194 Fix a wrong word in comment.
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
2016-07-17 13:08:07 +08:00
Cao Weiwei
3fc9a9ccb8 Fix a syntax error in comments
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
2016-07-16 22:41:04 +08:00
Cao Weiwei
627839072c Add output of integer argument
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
2016-07-16 20:20:00 +08:00
allencloud
d0081a0f47 better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 15:32:17 +08:00
allencloud
416613f2e5 return err when stack name does not exist
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-12 00:59:30 +08:00
Justin Cormack
0682468431 Make the docker proxy a standalone binary not a re-exec
This reduces memory usage with a lot of docker proxy processes.
On Docker for Mac we are currently carrying a patch to replace
the binary as we modify it to forward ports to the Mac rather
than the Linux VM, this allows us to simply replace this binary
in our packaging with one that has a compatible interface. This
patch does not provide an easy way to substitute a binary as
the interface is complex and there are few use cases, but where
needed this can be done.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 12:53:39 +01:00
Brian Goff
56f3422468 Use newer default values for mounts CLI
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 22:34:39 -04:00