11d3f7092e
use per-check timeouts
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:52 -05:00
e6e0837cbb
Use forked gocheck and vendor
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:50 -05:00
949e53a0f1
Merge pull request #21127 from icecrime/add_john_maintainer
...
Add @jhowardmsft to maintainers
2016-03-11 11:14:37 -08:00
11d10b77ac
Add @jhowardmsft to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-11 10:47:14 -08:00
9842c7a741
Merge pull request #21129 from allencloud/fix_typos
...
fix typos
2016-03-11 10:16:40 -08:00
12c67f42d8
Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry
...
Remove Windows-specific default registry definitions
2016-03-11 09:31:55 -08:00
1c0474ed63
Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand
...
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
2016-03-11 10:54:48 -05:00
bbeb859b64
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-11 23:22:16 +08:00
9ad946eded
Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
...
Fix the vendoring script on MacOS X
2016-03-10 22:45:55 -05:00
87535ca2e9
Remove Windows-specific default registry definitions
...
Going forward, Docker won't use a different default registry on Windows.
This changes Windows to use the standard Docker Hub registry as the
default registry.
There is a plan in place to migrate existing images from the Windows
registry to Hub's normal registry, in advance of the 1.11 release. In
the mean time, images on the Windows registry can be accessed by
prefixing them with `registry-win-tp3.docker.io/`.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-10 18:33:14 -08:00
94445b2fea
Put back the hack that was originally in place.
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-10 20:27:44 -05:00
edf3c0f112
Merge pull request #21102 from tiborvass/template-improve-contrast
...
Improve github templates
2016-03-10 20:18:30 -05:00
1d094255d5
Merge pull request #21045 from calavera/registry_config_options
...
Move registry service options to the daemon configuration.
2016-03-11 00:48:55 +01:00
8d9396c5f9
Improve github templates
...
Add more contrast and change `you` to `I` in pull requests template.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-10 18:42:44 -05:00
9488696814
Fix the vendoring script on MacOS X
...
The version of sed on MacOS X is different then the one on linux. The mac version
requires a parameter for the inline (-i) flag, where this isn't required on linux.
On the mac it thinks the -e flag is the parameter, and it causes the vendoring script
to fail.
This fix adds an empty string '' as a parameter to sed, which works fine on both the
mac and linux versions.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-10 16:43:53 -05:00
496aca386a
Merge pull request #20190 from rhatdan/volumeMan
...
Add a parent man page for docker volumes command
2016-03-10 22:36:50 +01:00
2b8e7ad460
Merge pull request #20478 from msabansal/HNSIntegration
...
Windows libnetwork integration
2016-03-10 13:33:04 -08:00
59586d02b1
Move registry service options to the daemon configuration.
...
Allowing to set their values in the daemon configuration file.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-10 11:53:11 -05:00
9ff7439162
Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting
...
Windows: Revendor github.com/Microsoft/go-winio
2016-03-10 08:28:36 -08:00
790d8f8520
Merge pull request #21018 from hqhq/hq_fix_race_exec_tty
...
Fix race condition when exec with tty
2016-03-10 08:27:54 -08:00
943ae26bc0
Merge pull request #20958 from calavera/basic_function_templates
...
Provide basic string manipulation functions for template executions.
2016-03-10 08:08:32 -08:00
04e9087d5d
Merge branch 'master' of github.com:docker/docker into volumeMan
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-03-10 09:39:16 -05:00
e7093a95cf
Merge pull request #21043 from runcom/plugin-sdk
...
docs: extend: plugins: mention the sdk + systemd socket activation
2016-03-10 15:12:23 +01:00
97e07ca10a
docs: extend: plugins: mention the sdk + systemd socket activation
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-10 12:17:06 +01:00
f70f570641
Merge pull request #21073 from moxiegirl/close-carry-20377
...
Add missing fields for NetworkSettings
2016-03-10 10:59:15 +01:00
e8026d8a98
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-03-09 20:33:21 -08:00
49485b769c
Merge pull request #21063 from allencloud/fix-typos
...
fix some typos.
2016-03-09 20:24:56 -08:00
d99be399c3
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
2016-03-09 22:27:37 -05:00
34b82a69b9
fix some typos.
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-10 10:09:27 +08:00
bd7c95e306
Merge pull request #21074 from mlaventure/test-userns-centos
...
Update UserNamespaceInKernel test requirement to handle redhat
2016-03-09 17:53:13 -08:00
8514880997
Provide basic string manupilation functions for template executions.
...
This change centralizes the template manipulation in a single package
and adds basic string functions to their execution.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-09 19:37:12 -05:00
b8a5fb76ea
Add Exposed ports and port-mapping configs to Sandbox
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-09 14:07:23 -08:00
fcff343cb4
Merge pull request #21067 from LK4D4/remove_comment
...
Remove obsolete comment
2016-03-09 13:27:12 -08:00
205844875c
Add missing fields for NetworkSettings
...
Dump from 1.10.1 has this fields.
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Close and carry #20377
Include David's request
Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-09 12:43:48 -08:00
6cbff9505c
Update UserNamespaceInKernel test requirement to handle redhat
...
On redhat based distribution, checking that USER_NS is compiled in the
kernel is not sufficient, we also have to check that the feature as
been enabled.
With this commit, it is now done by checking the content of
`/sys/module/user_namespace/parameters/enable`.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-09 12:42:59 -08:00
9bfdb93e3a
Merge pull request #21053 from WeiZhang555/vendor-engine-api
...
Vendor docker/engine-api
2016-03-09 15:19:26 -05:00
8706c5124a
Remove obsolete comment
...
There is no more race
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-09 09:38:39 -08:00
f97ab358cb
Merge pull request #21013 from calavera/events_since_nano
...
Compare event nanoseconds properly to filter since a specific date.
2016-03-09 09:30:54 -08:00
016be53236
Merge pull request #21056 from askb/optimize-TestBuildUsersAndGroups
...
Optimized integration test case DockerSuite.TestBuildUsersAndGroups fixes #19425
2016-03-09 09:15:01 -08:00
5d3ae7f989
Merge pull request #20965 from yongtang/19425-DockerSuite.TestRunUnshareProc
...
Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc.
2016-03-09 10:32:09 -05:00
faacbcf53e
Merge pull request #20930 from cloojure/patch-3
...
Update dockernetworks.md
2016-03-09 15:58:38 +01:00
deeb5c95e2
Optimized integration test case DockerSuite.TestBuildUsersAndGroups for #19425
...
Removed unnecessary RUN statements and combined some of the RUN statement into a single line.
The runtime performance is seen as follows:
pre-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
63.074s
post-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
49.698s
Signed-off-by: Anil Belur <askb23@gmail.com>
2016-03-09 18:00:56 +05:30
f446771f0b
Vendor docker/engine-api
...
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-03-09 15:52:44 +08:00
3d09842713
Merge pull request #21033 from estesp/workdir-perms-userns
...
Ensure WORKDIR is created with remapped root ownership
2016-03-09 07:22:08 +01:00
5a65408941
Vendoring libnetwork v0.7.0-dev.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-08 18:47:02 -08:00
0771230daa
Merge pull request #20342 from vijaykilari/fix_20325
...
#20325 : arm64: Use gccgo as bootstrap for compiling golang
2016-03-08 16:11:42 -08:00
6b0119aefb
Merge pull request #20940 from HackToday/fixsave
...
Refine error message when save non-exist image
2016-03-09 00:59:43 +01:00
a9f2006f10
Compare event nanoseconds properly to filter since a specific date.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-08 17:07:58 -05:00
dd32445ecc
Merge pull request #18697 from jfrazelle/pids-cgroup
...
Add PIDs cgroup support to Docker
2016-03-08 14:03:36 -08:00
76a5ab3b43
Merge pull request #21035 from LK4D4/exec_ids
...
make TestExecInspectIDs less racy
2016-03-08 13:02:01 -08:00
Brian Goff
Arnaud Porterie
David Calavera
Tibor Vass
allencloud
Aaron Lehmann
Ken Cochrane
Sebastiaan van Stijn
Tibor Vass
Alexander Morozov
Dan Walsh
Antonio Murdaca
msabansal
Alessandro Boch
Kanstantsin Shautsou
Kenfe-Mickael Laventure
Alexander Morozov
Tõnis Tiigi
Phil Estes
Anil Belur
Zhang Wei
Antonio Murdaca
Tianon Gravi