Yong Tang
7ccd8bda77
Merge pull request #33722 from TomSweeneyRedHat/tsweeney/privmessage
...
Add clarification to --privileged error message
2017-08-09 16:08:10 -07:00
Sebastiaan van Stijn
2e38c07814
Merge pull request #34430 from AkihiroSuda/promote-overlay2
...
graphdriver: promote overlay2 over aufs
2017-08-09 21:41:36 +02:00
Sebastiaan van Stijn
335033e25f
Fix solaris reference to config
...
Commit db63f9370e
extracted daemon configuration to its own
package, but did not update the Solaris stubs.
This updates the Solaris daemon.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-09 20:58:31 +02:00
Yong Tang
bbb401de87
Merge pull request #34445 from pmoust/f-seccomp-quotacl
...
seccomp: whitelist quotactl with CAP_SYS_ADMIN
2017-08-09 11:53:13 -07:00
John Howard
0ba50819ba
LCOW: Force to be Hyper-V Isolation
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-09 09:26:51 -07:00
Panagiotis Moustafellos
cf6e1c5dfd
seccomp: whitelist quotactl with CAP_SYS_ADMIN
...
The quotactl syscall is being whitelisted in default seccomp profile,
gated by CAP_SYS_ADMIN.
Signed-off-by: Panagiotis Moustafellos <pmoust@elastic.co>
2017-08-09 18:52:15 +03:00
Sebastiaan van Stijn
ab29a85103
Merge pull request #34455 from vieux/hide_swarm_plugins_exp
...
hide swarm plugins behind experimental flag
2017-08-09 17:52:14 +02:00
John Howard
779469d9c9
Revendor Microsoft/go-winio @ v0.4.5
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-09 08:31:43 -07:00
Daniel Nephin
e593b72cc9
Fix exclude list in make.ps1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 11:03:20 -04:00
Daniel Nephin
c66c0447ef
move api test client setup to a package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 11:02:57 -04:00
Daniel Nephin
5fa134b906
Protect images in the integration/ suite
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 11:02:57 -04:00
Daniel Nephin
4308e881cc
Cleanup test output, and binaries.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 11:02:57 -04:00
Daniel Nephin
de46fb736d
Add integration suite
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 11:02:57 -04:00
Daniel Nephin
bc82b13995
Remove test-integration-cli and references to it.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 11:02:57 -04:00
Vincent Demeester
6b025a8b66
Introduce test-integration
target (and deprecate/freeze test-integration-cli
)
...
This adds a new package `integration` where `engine` integration tests
should live. Those integration tests should not depends on any `cli`
components (except from the `dockerd` daemon for now — to actually
start a daemon).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-08-09 11:02:57 -04:00
Yong Tang
187cd25517
Merge pull request #34276 from keloyang/testcase-docker-cp-hardlink
...
Add unit test for RebaseArchiveEntries
2017-08-09 07:29:09 -07:00
Yong Tang
5c49240c94
Merge pull request #34449 from Microsoft/jjh/hcsshim0.6.3
...
Revendor Microsoft/hcsshim @V0.6.3
2017-08-09 07:21:49 -07:00
Justin Cormack
ac87bb3f85
Merge pull request #34448 from Microsoft/jjh/donotblockexport
...
LCOW: Don't block export
2017-08-09 14:17:25 +01:00
Justin Cormack
31582d00ab
Merge pull request #34450 from Microsoft/jjh/opengcsclient
...
Vendor change jhowardmsft/opengcs to Microsoft/opengcs
2017-08-09 14:16:31 +01:00
Naveed Jamil
bc756061a3
Add test coverage to signal/trap.go
...
Signed-off-by: Naveed Jamil <naveed.jamil@tenpearls.com>
2017-08-09 15:13:38 +05:00
yangshukui
1f1e8e9c0e
use testify to check error for test unit test of archive package
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2017-08-09 10:27:01 +08:00
Victor Vieux
4930020210
hide swarm plugins behind experimental flag
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-08-08 18:33:25 -07:00
Tibor Vass
c7911389e6
Merge pull request #34441 from vdemeester/move-pkg-templates-away
...
Move pkg/templates away
2017-08-08 17:54:17 -07:00
John Howard
5463c58217
Vendor Microsoft/opengcs @ v0.3.2
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-08 15:43:43 -07:00
John Howard
ee0587a45d
jhoward/opengcs --> Microsoft/opengcs
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-08 14:43:43 -07:00
John Howard
71328a7af5
LCOW: Additional flags for VHD boot
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-08 14:40:33 -07:00
John Howard
3e71acf0fc
Revendor Microsoft/hcsshim @V0.6.3
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-08 14:08:03 -07:00
John Howard
5459ef0ecf
LCOW: Don't block export
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-08 12:54:06 -07:00
Yong Tang
cbbc28341c
Merge pull request #34442 from vdemeester/move-pkg-listeners-away
...
Move pkg/listeners away
2017-08-08 12:04:18 -07:00
Vincent Demeester
9ef3b53597
Move pkg/templates away
...
- Remove unused function and variables from the package
- Remove usage of it from `profiles/apparmor` where it wasn't required
- Move the package to `daemon/logger/templates` where it's only used
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-08-08 18:16:41 +02:00
Vincent Demeester
c204fce2ee
Move pkg/listeners away
...
It is only used in `daemon` and should really live there.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-08-08 18:14:04 +02:00
Sebastiaan van Stijn
526fc40145
Merge pull request #34408 from rcjsuen/ignore-case
...
Update tmLanguage file to not be case sensitive
2017-08-08 16:13:50 +02:00
Akihiro Suda
fd6ffc2337
graphdriver: promote overlay2 over aufs
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-08-08 10:17:37 +00:00
Yong Tang
202cf001dd
Merge pull request #33852 from jstarks/win_named_pipes
...
Windows: named pipe mounts
2017-08-07 16:54:05 -07:00
John Starks
54354db850
Windows: Add named pipe mount support
...
Current insider builds of Windows have support for mounting individual
named pipe servers from the host to the guest. This allows, for example,
exposing the docker engine's named pipe to a container.
This change allows the user to request such a mount via the normal bind
mount syntax in the CLI:
docker run -v \\.\pipe\docker_engine:\\.\pipe\docker_engine <args>
Signed-off-by: John Starks <jostarks@microsoft.com>
2017-08-07 11:34:36 -07:00
Kenfe-Mickaël Laventure
6f1907898f
Merge pull request #34386 from tklauser/pkg-term-makeraw-fix
...
pkg/term: set termios VMIN and VTIME in MakeRaw on Linux
2017-08-07 16:34:40 +02:00
Kenfe-Mickaël Laventure
537f8c1e8d
Merge pull request #34398 from Microsoft/jjh/libcontainerd
...
LCOW: Remove hard-coding
2017-08-07 16:31:44 +02:00
yangshukui
ae52cea3ab
chmod config.v2.json to 0600
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2017-08-07 18:10:08 +08:00
yangshukui
82eb9002e9
Add unit test for RebaseArchiveEntries
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2017-08-07 16:40:54 +08:00
Remy Suen
abd39744c6
Update tmLanguage file to not be case sensitive
...
While convention states that Dockerfile instructions should be
written in uppercase, the engine allows them to be mixed case or in
lowercase. The tmLanguage file should tolerate this and provide
highlighting support even if instructions are not written in
uppercase.
Signed-off-by: Remy Suen <remy.suen@gmail.com>
2017-08-05 19:45:54 +09:00
Sebastiaan van Stijn
d4f6db83c2
Merge pull request #34396 from Microsoft/jjh/movescratch
...
LCOW: Move toolsScratchPath to /tmp
2017-08-05 11:37:15 +01:00
Sebastiaan van Stijn
80f2c054ca
Merge pull request #34399 from Microsoft/jjh/hcsshim0.6.2
...
Revendor Microsoft/hcsshim @ v0.6.2
2017-08-05 11:35:11 +01:00
Sascha Andres
6362843e67
Log payload only [logentries]
...
If you want to use the advanced query in logentries
logging in json is very useful. If you do not need
the advanced information with
--log-opt line-only=true just logs the payload
Signed-off-by: Sascha Andres <sascha.andres@outlook.com>
2017-08-05 09:54:21 +02:00
Daniel Nephin
4db2ea02cf
Add testing.md
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-04 17:36:18 -04:00
Yong Tang
cb9128677f
Merge pull request #34371 from Microsoft/jjh/logrustimestamp
...
logrus use full timestamp
2017-08-04 07:25:59 -07:00
Sebastiaan van Stijn
7e59fbe50e
Merge pull request #34395 from aboch/npe
...
Fix api server null pointer def on inspect/ls null ipam-driver networks
2017-08-04 02:07:46 +02:00
Yong Tang
7843e40ad5
Merge pull request #34383 from wrfly/patch-1
...
fix client.Transport verify
2017-08-03 16:47:41 -07:00
John Howard
809fed5fa6
Revendor Microsoft/hcsshim @ v0.6.2
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-03 16:29:25 -07:00
John Howard
ffdef6255e
LCOW: Remove hard-coding
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-03 16:10:25 -07:00
John Stephens
a3ffc42b13
Merge pull request #34170 from Microsoft/jjh/sandbox
...
LCOW: Dynamic sandbox management
2017-08-03 16:07:40 -07:00