4e58c5cd9f
Merge pull request #28182 from msabansal/overlayexternal
...
Swarm-mode overlay networking support for windows
Upstream-commit: 4705728b41db6f0951564e48d573f439a092bd63
Component: engine
2016-11-10 20:42:51 +01:00
a2106ea21e
Merge pull request #28173 from nishanttotla/pin-images-by-digest
...
Pin images by digest
Upstream-commit: c13bf5ba51c4f6a1ba5e5c0da0d4f85d2d5b9116
Component: engine
2016-11-10 10:59:28 -08:00
7cfb8aa321
Swarm-mode overlay networking support for windows
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: ed8ccc304621289298fdb7aac4239cfe767b7bae
Component: engine
2016-11-10 09:54:40 -08:00
58e0e2f371
Pin image by digest on service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 764a9ed357bca8fdccf1a794278463453f83f6ff
Component: engine
2016-11-09 23:31:26 -08:00
3d84cacc07
Merge pull request #28138 from dmcgowan/handle-overlay2-copy-up-bug
...
Use naive diff for overlay2 when opaque copy up bug present
Upstream-commit: a3b0ade34685f4f25875a0a485814d1acf373af3
Component: engine
2016-11-09 22:29:19 -05:00
34493b85fd
Merge pull request #28219 from darrenstahlmsft/WindowsConflictingOptions
...
Adding more strict resource checks on Windows
Upstream-commit: f7b27ded4ac7cdcea7015e9eb55c4529dec3970d
Component: engine
2016-11-09 18:01:03 -08:00
486562b02a
Merge pull request #27967 from aaronlehmann/encryption
...
Encryption at rest of manager keys and raft data
Upstream-commit: 18a07f599127f9aa6743de372f0384ffe31fd872
Component: engine
2016-11-09 17:49:26 -08:00
828e14b6f7
Adding more strict resource checks on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 0ed00b36ff7d8651e4d11a41507f81441c081388
Component: engine
2016-11-09 16:29:54 -08:00
f3d621f988
Lock/unlock integration tests
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c3c70c4bcd775d20e2d4a4989733f7ad6b2b90b2
Component: engine
2016-11-09 16:09:01 -08:00
2394a196a1
Add unlock key rotation
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a6030a50c95cd4e8b39b5f4d5705bb23ebdb28c5
Component: engine
2016-11-09 16:09:01 -08:00
0827ead1b6
Revise swarm init/update flags, add unlocking capability
...
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0f9fc54df9274327ed22f4e07f0981a648e0278a
Component: engine
2016-11-09 16:09:00 -08:00
2874df7efa
Add support for swarm init lock and swarm unlock
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6
Component: engine
2016-11-09 16:09:00 -08:00
75a25a369f
Merge pull request #27915 from rhvgoyal/graph-create-opts
...
Pass all graphdriver create() parameters in a struct
Upstream-commit: f11ac963af5a94ae0c36aaa2a67a671c6a313e59
Component: engine
2016-11-10 01:07:41 +01:00
174f2a0d72
Merge pull request #28025 from vdemeester/swarm-mode-templating
...
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
2016-11-09 15:57:52 -08:00
e85707f736
Merge pull request #28002 from Microsoft/jjh/noreexec
...
Windows: Allow a no-reexec option for importLayer
Upstream-commit: 5e3d777401cd96bd9958971533222726edb1caa5
Component: engine
2016-11-09 14:46:21 -08:00
9549c6b9d6
Add support for swarm mode templating
...
Wire templating support of swarmkit for the engine, in order to be used
through services.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6212ea669b4e92b3aa3985857f827ee9b95271fd
Component: engine
2016-11-09 23:28:06 +01:00
5656296e4b
Use naive diff for overlay2 when opaque copy up bug present
...
When running on a kernel which is not patched for the copy up bug
overlay2 will use the naive diff driver.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 64b43ed5ecf3e805bd72bd6a9493c8c5d08478aa
Component: engine
2016-11-09 13:42:10 -08:00
9c868a7b94
Merge pull request #27433 from AkihiroSuda/fix-ovl-xfs-ftype0
...
overlay: warn if overlay backing fs doesn't support d_type
Upstream-commit: 643ac2f804a5242062113ace64bf68506027c9a6
Component: engine
2016-11-09 13:39:07 -08:00
8c7175ef3e
Merge pull request #27794 from ehazlett/secrets
...
Secret Management
Upstream-commit: 5e143b5f8d82537635a57f3d9eda8126caf68a6f
Component: engine
2016-11-09 22:26:53 +01:00
459e915b2e
Pass all graphdriver create() parameters in a struct
...
This allows for easy extension of adding more parameters to existing
parameters list. Otherwise adding a single parameter changes code
at so many places.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: b937aa8e6968d805527d163e6f477d496ceb88d7
Component: engine
2016-11-09 15:59:58 -05:00
dc6854b4b3
Merge pull request #28184 from Microsoft/jjh/user
...
Windows: Plumb through user
Upstream-commit: f67d4b897adc9048269d1b91435b6dcbf69e36d1
Component: engine
2016-11-09 11:32:42 -08:00
6941a29c56
Correct secrets permissions when userns enabled
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 8119809b68bee9a027bae9d5851b11c743438bd6
Component: engine
2016-11-09 14:27:46 -05:00
bd20a72add
more review updates
...
- return err instead of wrap for update secret
- add omitempty for data in secret spec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 427c70d97779566b2b3ea3a9141bb9bf3dd05dd8
Component: engine
2016-11-09 14:27:45 -05:00
d5d838f9f3
embed spec when converting from grpc
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: a9d41184296c971c650f7d97a67ae5c9b44d4200
Component: engine
2016-11-09 14:27:45 -05:00
5907fa959f
more review updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: eff36b7d669a8d0dbb9d79b70f9cb1f8a6ffdbd8
Component: engine
2016-11-09 14:27:45 -05:00
19e0a8c065
support labels for secrets upon creation; review updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 583c013a8735031f4e5090bb1699effb64daf950
Component: engine
2016-11-09 14:27:45 -05:00
e093728442
review updates
...
- use Filters instead of Filter for secret list
- UID, GID -> string
- getSecrets -> getSecretsByName
- updated test case for secrets with better source
- use golang.org/x/context instead of context
- for grpc conversion allocate with make
- check for nil with task.Spec.GetContainer()
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: b2e4c7f3b5b30fc6940768ec41836d708a48b463
Component: engine
2016-11-09 14:27:45 -05:00
e9ea5a5560
update to support new target in swarmkit
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 88dea0e06e0e94a8ab4cb5fe852e26bff309261a
Component: engine
2016-11-09 14:27:44 -05:00
bc88c956b6
secrets: only setup secret mount if secrets are requested
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 6d12de53699d6fa03c70493eec63ac5cfa41f2fe
Component: engine
2016-11-09 14:27:44 -05:00
a28c910916
add secret support for service update
...
- add nosuid and noexec to tmpfs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 00237a96249739dbf426d81672a904e9f4c5e702
Component: engine
2016-11-09 14:27:44 -05:00
e2eea356c2
proper cleanup upon mount fail
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 0c170a76c51be67bd6f7c4d38ed28ddcb473eac9
Component: engine
2016-11-09 14:27:43 -05:00
45bc21e90e
update to support latest swarm changes
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: f50a65ff0c28618f798d06838e36b015dd022b45
Component: engine
2016-11-09 14:27:43 -05:00
848c015ac1
more review updates
...
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 189f89301e0abfee32447f2ca23dacd3a96de06d
Component: engine
2016-11-09 14:27:43 -05:00
dde21cf7dc
review changes
...
- fix lint issues
- use errors pkg for wrapping errors
- cleanup on error when setting up secrets mount
- fix erroneous import
- remove unneeded switch for secret reference mode
- return single mount for secrets instead of slice
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 857e60c2f943a09e3ec0ac0f236821b797935900
Component: engine
2016-11-09 14:27:43 -05:00
9dbbc071d5
secrets: secret management for swarm
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
wip: use tmpfs for swarm secrets
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
wip: inject secrets from swarm secret store
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
secrets: use secret names in cli for service create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
switch to use mounts instead of volumes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
vendor: use ehazlett swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
secrets: finish secret update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 3716ec25b423d8ff7dfa231a7b3cf0154726ed37
Component: engine
2016-11-09 14:27:43 -05:00
07ffcc9abc
Merge pull request #28189 from Microsoft/jjh/fluentd
...
Windows: Enable fluentd logdriver
Upstream-commit: bf960a6bdc3fae8c69b8ecf6bbc2562548f55929
Component: engine
2016-11-09 11:28:37 -05:00
e788fbec24
Merge pull request #28141 from darrenstahlmsft/TerminateTemplates
...
Terminate template containers before delting a layer
Upstream-commit: 70b53c932dbc757c44ae7b18ad122b043fb82530
Component: engine
2016-11-09 15:44:33 +01:00
72ae55dd14
Merge pull request #28037 from crosbymichael/tini
...
Replace grimes with tini for default init shipped in Docker
Upstream-commit: 93e837d1d2d3a24b0219ccadc1fdf170d242c137
Component: engine
2016-11-09 09:29:42 -05:00
a40c9e3002
Merge pull request #26088 from akirakoyasu/patch-fluent-unixsocket
...
Proposal: unix-sockets support in Fluentd logging driver
Upstream-commit: 806f09bf32c49cd0493a97522cd809b09b52dfb6
Component: engine
2016-11-09 12:49:06 +01:00
fef442cb37
Merge pull request #28098 from yongtang/25099-oom_score_adj-empty-env
...
Fix `/proc/<pid>/oom_score_adj: invalid argument` error caused by empty env name
Upstream-commit: c025049c27c2cc8a6f1f978769c89a1fdf07a6f3
Component: engine
2016-11-09 10:39:18 +01:00
7198214971
Merge pull request #27997 from aaronlehmann/raft-options
...
cli: Add options for Raft snapshotting
Upstream-commit: 29a38a4fe8caebbad9ea72ca0d4b4fc80118df3c
Component: engine
2016-11-09 10:19:45 +01:00
af0174a7c5
overlay: warn if overlay backing fs doesn't support d_type
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 2e20e63da2a8a0ffbbb3f2146f87559e17f43046
Component: engine
2016-11-09 07:18:27 +00:00
e57bdfb80c
Windows: Enable fluentd logdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cff9679c6cdd0b7f3dc691ed00f294ac93274c1d
Component: engine
2016-11-08 19:54:57 -08:00
dbcd2372ba
Windows: Allow a no-reexec option for importLayer
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d9294719b50452b3d88372468b6264c9d2467f02
Component: engine
2016-11-08 17:57:43 -08:00
cc2d08fb86
Merge pull request #27567 from yongtang/24391-dns-setting
...
Add custom DNS settings to service definition
Upstream-commit: 462e57f05eba94cacad2c5e1383d94baf8fe090b
Component: engine
2016-11-08 17:43:00 -08:00
234aecaaa6
Windows: Plumb through user
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5207ff7202327bd06fa7e8df4c58d6a944899b60
Component: engine
2016-11-08 17:41:56 -08:00
067ec4c6cd
Merge pull request #27420 from Shugyousha/journaldfixes
...
Small logger journald cleanup
Upstream-commit: 3975d648b70f2f18c1ba15c4b590de5c418d34db
Component: engine
2016-11-09 01:35:08 +01:00
df125f380f
Merge pull request #27992 from Microsoft/jjh/minapitoinfo
...
Adds `MinAPIVersion` to docker version
Upstream-commit: 2d4203222574623b10d94817b9959a08698f516b
Component: engine
2016-11-08 15:49:33 -08:00
6fb775ea79
Add custom DNS settings to service definition
...
This fix tries to fix the issue raised in 24391 about allowing
custom DNS settings to service definition.
This fix adds `DNSConfig` (`Nameservers`, `Options`, `Search`) to
service definition, as well as `--dns`, `--dns-opt`, and `dns-search`
to `service create`.
An integration test has been added to cover the changes in this fix.
This fix fixes 24391.
A PR in swarmkit will be created separately.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9e8adbecf505620a1cb3a840189b59450493a00b
Component: engine
2016-11-08 15:41:32 -08:00
40ba948937
Terminate template VMs on layer delete
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: c58e8dea6ce1e9ff02c383c1698733fd0554ba2e
Component: engine
2016-11-08 15:39:25 -08:00
