bb626a427e
Fix make build-integration-cli-on-swarm
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 2fddf9f6efc155c880dfa689bd7df3a5a31ba459
Component: engine
2017-08-12 06:53:25 +00:00
0f9d35cd6f
Merge pull request #34000 from dnephin/test-integration-api
...
Introduce `test-integration` target
Upstream-commit: f34e4d295d5c17a78c33beb14b65e5d001c16968
Component: engine
2017-08-11 10:39:27 -07:00
5963ab8f5e
Merge pull request #34378 from fcrisciani/ln-vendoring
...
Vendoring libnetwork
Upstream-commit: aaee3ca6c1129f62eaa64a76a3f770ae09d04d09
Component: engine
2017-08-10 17:07:14 -07:00
c020b02684
Merge pull request #34452 from Microsoft/jjh/gowiniov0.4.5
...
Revendor Microsoft/go-winio @ v0.4.5
Upstream-commit: 45248ae668cd8ab02cf597ab9e9f72564a262f6c
Component: engine
2017-08-10 17:05:36 -07:00
14f2519dda
Merge pull request #34470 from thaJeztah/fix-solaris-config
...
Fix solaris reference to config
Upstream-commit: 2638729c7a57332737e2096d68bed5e1940053d4
Component: engine
2017-08-10 09:41:50 -07:00
848a1fd437
Vendoring libnetwork
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 709a433ec827b034b798e748d4393f7c9f3b3bc0
Component: engine
2017-08-10 08:51:30 -07:00
c75716b8e7
Merge pull request #33722 from TomSweeneyRedHat/tsweeney/privmessage
...
Add clarification to --privileged error message
Upstream-commit: 7ccd8bda77fb075b2c5d849f55445d0b4144acc9
Component: engine
2017-08-09 16:08:10 -07:00
479e9126c5
Merge pull request #34430 from AkihiroSuda/promote-overlay2
...
graphdriver: promote overlay2 over aufs
Upstream-commit: 2e38c07814fbb99364838df2cd1092744f6bd1e1
Component: engine
2017-08-09 21:41:36 +02:00
592e32b2a4
Fix solaris reference to config
...
Commit db63f9370e26d725357c703cbaf9ab63cc7b6d0a
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 >
Upstream-commit: 335033e25fae0173217e70d4b8dfc5df682ea913
Component: engine
2017-08-09 20:58:31 +02:00
028f9b05af
Merge pull request #34445 from pmoust/f-seccomp-quotacl
...
seccomp: whitelist quotactl with CAP_SYS_ADMIN
Upstream-commit: bbb401de87b21659399909b15707cf2816be0f78
Component: engine
2017-08-09 11:53:13 -07:00
840bc1dc6a
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 >
Upstream-commit: cf6e1c5dfd07f5048606bb7b21464c658e252322
Component: engine
2017-08-09 18:52:15 +03:00
7b76095dc9
Merge pull request #34455 from vieux/hide_swarm_plugins_exp
...
hide swarm plugins behind experimental flag
Upstream-commit: ab29a85103f2b251094cd0423d84de13cdb930ab
Component: engine
2017-08-09 17:52:14 +02:00
94b4666b88
Revendor Microsoft/go-winio @ v0.4.5
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 779469d9c98b83d54bc45f808de76c2088ffe8c7
Component: engine
2017-08-09 08:31:43 -07:00
48f5d911ea
Fix exclude list in make.ps1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e593b72cc9d8a2fd9c7cd98b82ed468dfe3577e2
Component: engine
2017-08-09 11:03:20 -04:00
b63db0a43c
move api test client setup to a package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c66c0447efe9c7e7afdcf75b950897c67894256b
Component: engine
2017-08-09 11:02:57 -04:00
e443662141
Protect images in the integration/ suite
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5fa134b9061d0b794e9e5b887a8ea4ee15fecb61
Component: engine
2017-08-09 11:02:57 -04:00
b4b904d49b
Cleanup test output, and binaries.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4308e881cc00141a1dd187120d1c4e2106148282
Component: engine
2017-08-09 11:02:57 -04:00
b327efdd99
Add integration suite
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: de46fb736d0e3e41b0f5646b43e0963bcf839baa
Component: engine
2017-08-09 11:02:57 -04:00
9a9d90f97d
Remove test-integration-cli and references to it.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bc82b139955c4a0edb20b070926469cceea0fbbb
Component: engine
2017-08-09 11:02:57 -04:00
43db8c0c15
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 >
Upstream-commit: 6b025a8b665f7b976bb2560488ba07f55dbf0fb6
Component: engine
2017-08-09 11:02:57 -04:00
6079e4e9e5
Merge pull request #34276 from keloyang/testcase-docker-cp-hardlink
...
Add unit test for RebaseArchiveEntries
Upstream-commit: 187cd25517e348230a0b5064392dc9f00efb13ae
Component: engine
2017-08-09 07:29:09 -07:00
5a28415680
Merge pull request #34449 from Microsoft/jjh/hcsshim0.6.3
...
Revendor Microsoft/hcsshim @V0.6.3
Upstream-commit: 5c49240c94783a3ecb3881890725136d8d743dea
Component: engine
2017-08-09 07:21:49 -07:00
a0733e5702
Merge pull request #34448 from Microsoft/jjh/donotblockexport
...
LCOW: Don't block export
Upstream-commit: ac87bb3f85d41b21f425c3a4266ab3b567dc9718
Component: engine
2017-08-09 14:17:25 +01:00
58438575bb
Merge pull request #34450 from Microsoft/jjh/opengcsclient
...
Vendor change jhowardmsft/opengcs to Microsoft/opengcs
Upstream-commit: 31582d00ab7adc3532df92f34a84ad28aa278b0f
Component: engine
2017-08-09 14:16:31 +01:00
9fb953b99c
use testify to check error for test unit test of archive package
...
Signed-off-by: yangshukui <yangshukui@huawei.com >
Upstream-commit: 1f1e8e9c0e1fa4c3d9b016e6746f7ba2755e888f
Component: engine
2017-08-09 10:27:01 +08:00
de9b157e25
hide swarm plugins behind experimental flag
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 493002021094d72d405e1cd5bfa10b8080f67920
Component: engine
2017-08-08 18:33:25 -07:00
7de15bd230
Merge pull request #34441 from vdemeester/move-pkg-templates-away
...
Move pkg/templates away
Upstream-commit: c7911389e646104180063f069280a8b6cbc47211
Component: engine
2017-08-08 17:54:17 -07:00
df85fb5a80
Vendor Microsoft/opengcs @ v0.3.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5463c582172e04132ecf48fad00cc90c8e233386
Component: engine
2017-08-08 15:43:43 -07:00
b9168879f3
jhoward/opengcs --> Microsoft/opengcs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ee0587a45d94443271c695a0d407514fd36f7fa4
Component: engine
2017-08-08 14:43:43 -07:00
d433044d76
Revendor Microsoft/hcsshim @V0.6.3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3e71acf0fc485cccc9feda57ea53a69377179321
Component: engine
2017-08-08 14:08:03 -07:00
0c001aeeff
LCOW: Don't block export
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5459ef0ecf429ed0293e975abee11bdbbc2a2f14
Component: engine
2017-08-08 12:54:06 -07:00
7d3a435b2f
Merge pull request #34442 from vdemeester/move-pkg-listeners-away
...
Move pkg/listeners away
Upstream-commit: cbbc28341ccc3a4597f1d1ce1259d3fbe1b29a6d
Component: engine
2017-08-08 12:04:18 -07:00
6ed8995fb3
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 >
Upstream-commit: 9ef3b535974612b137abae062b7a8a0f7e969871
Component: engine
2017-08-08 18:16:41 +02:00
1b1bfe0449
Move pkg/listeners away
...
It is only used in `daemon` and should really live there.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c204fce2ee926417d1dc7d10c043a81b93d2a72b
Component: engine
2017-08-08 18:14:04 +02:00
67eefe8cfd
Merge pull request #34408 from rcjsuen/ignore-case
...
Update tmLanguage file to not be case sensitive
Upstream-commit: 526fc401458bc516d803201802fe336f368f4b86
Component: engine
2017-08-08 16:13:50 +02:00
308b435aad
graphdriver: promote overlay2 over aufs
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: fd6ffc2337aedf1019582851fe0cf4f6f33f113a
Component: engine
2017-08-08 10:17:37 +00:00
fae0c281b6
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 >
Upstream-commit: 54354db850664783918a1fc9d208bcfcf47c28e2
Component: engine
2017-08-07 11:34:36 -07:00
38b8a5078a
Merge pull request #34386 from tklauser/pkg-term-makeraw-fix
...
pkg/term: set termios VMIN and VTIME in MakeRaw on Linux
Upstream-commit: 6f1907898f59300921b358b21da1e49a5184d088
Component: engine
2017-08-07 16:34:40 +02:00
f593e24117
Merge pull request #34398 from Microsoft/jjh/libcontainerd
...
LCOW: Remove hard-coding
Upstream-commit: 537f8c1e8df8e4f4f7754e92866ba308e232f918
Component: engine
2017-08-07 16:31:44 +02:00
f2e64d9bb8
Add unit test for RebaseArchiveEntries
...
Signed-off-by: yangshukui <yangshukui@huawei.com >
Upstream-commit: 82eb9002e928f06ff694c618887bbc7d61f4b8e0
Component: engine
2017-08-07 16:40:54 +08:00
9c9a27667d
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 >
Upstream-commit: abd39744c6f3ed854500e423f5fabf952165161f
Component: engine
2017-08-05 19:45:54 +09:00
18cbafdfc4
Merge pull request #34396 from Microsoft/jjh/movescratch
...
LCOW: Move toolsScratchPath to /tmp
Upstream-commit: d4f6db83c21cfc6af54fffb1f13e8acb7199f96a
Component: engine
2017-08-05 11:37:15 +01:00
eb3232efc3
Merge pull request #34399 from Microsoft/jjh/hcsshim0.6.2
...
Revendor Microsoft/hcsshim @ v0.6.2
Upstream-commit: 80f2c054ca192ed47d9d6e8573e5fff2d75df330
Component: engine
2017-08-05 11:35:11 +01:00
65cd1af516
Merge pull request #34371 from Microsoft/jjh/logrustimestamp
...
logrus use full timestamp
Upstream-commit: cb9128677f29a1e4d7ff2a74efc9cc7bcdf0169b
Component: engine
2017-08-04 07:25:59 -07:00
0858223c3e
Merge pull request #34395 from aboch/npe
...
Fix api server null pointer def on inspect/ls null ipam-driver networks
Upstream-commit: 7e59fbe50eaa5fd952f7a05aa827e2dc738c3794
Component: engine
2017-08-04 02:07:46 +02:00
265dd86bef
Merge pull request #34383 from wrfly/patch-1
...
fix client.Transport verify
Upstream-commit: 7843e40ad5df83671615a61c904930a701896f52
Component: engine
2017-08-03 16:47:41 -07:00
c9e85143b7
Revendor Microsoft/hcsshim @ v0.6.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 809fed5fa6c54befe45b90b25c961e2f84674419
Component: engine
2017-08-03 16:29:25 -07:00
cb0fd7f7e8
LCOW: Remove hard-coding
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ffdef6255e9c81d5778864cac4726794d7c1be0d
Component: engine
2017-08-03 16:10:25 -07:00
6183428a5c
Merge pull request #34170 from Microsoft/jjh/sandbox
...
LCOW: Dynamic sandbox management
Upstream-commit: a3ffc42b13063e59dbf7d52a56f8806ac71160eb
Component: engine
2017-08-03 16:07:40 -07:00
3b5cce5785
LCOW: Move toolsScratchPath to /tmp
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 993f4072874ee5cdce93ec9b6525e1fa3ebda4c8
Component: engine
2017-08-03 15:48:53 -07:00
