Commit Graph

4403 Commits

Author SHA1 Message Date
ca36766d89 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
2016-11-10 17:59:57 -08:00
3baa399d95 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
d19c3e6850 Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
Fix failure to get containers when deleting a layer
Upstream-commit: d54f4472fdfad1a9c9b04ed2b50ac010556ab44e
Component: engine
2016-11-10 17:10:05 -08:00
3213314d62 Merge pull request #28031 from yongtang/27902-extra-hosts
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: bed96ce922da5fa9df98b826ff0e4ad4bf375a31
Component: engine
2016-11-10 16:55:29 -08:00
ce9a44097a Merge pull request #28268 from Microsoft/jjh/clientcheck
Windows: Additional client check
Upstream-commit: 29b7a737925d05f3fb46db97ae64661c6e9f3a31
Component: engine
2016-11-10 16:11:44 -08:00
fadae43674 move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
2016-11-10 15:51:32 -08:00
87b507f694 Merge pull request #28228 from tonistiigi/swarm-cert-expired
Start daemon if certificates have been expired
Upstream-commit: 1e592349f192d020b14372f4d3c21cd3a7c8bd9a
Component: engine
2016-11-10 15:50:36 -08:00
4cf2d87976 Merge pull request #28221 from aboch/ala
Add local address autodetection on swarm init
Upstream-commit: 5d1feb561f1f8b402b5c77b2f27f3d571bd2b226
Component: engine
2016-11-10 15:45:59 -08:00
f4dd1c6a23 Merge pull request #28264 from dmcgowan/fix-overlay2-naivediff-unittest
Skip overlay2 diff tests when using naivediff
Upstream-commit: f3f9b3dac9114cfe0f8bf0380dd7343cc58d3a1c
Component: engine
2016-11-11 00:24:06 +01:00
0d1faa11e0 Merge pull request #28089 from aluzzardi/service-logs
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
2016-11-10 15:13:41 -08:00
8dbcc088be Windows: Additional client check
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6b4ad8d6f51f43711846945e2dd8ad40d7020b53
Component: engine
2016-11-10 14:35:19 -08:00
b55a4aaec7 Start daemon if certificates have been expired
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 439de7694d67eede9867aae12f304772962bffcd
Component: engine
2016-11-10 14:11:53 -08:00
9a8c3a6932 Fix failure to get containers when deleting a layer
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: d4095a5902b62181d49ef07db18610975cb49d08
Component: engine
2016-11-10 14:07:11 -08:00
17c10a9402 Skip overlay2 diff tests when using naivediff
Naivediff fails when layers are created directly on top of
each other. Other graphdrivers which use naivediff already
skip these tests. Until naivediff is fixed, skip with overlay2
when running tests on a kernel which causes naivediff fallback.
Fix applydiff to never use the naivediff size when not applying
changes with naivediff.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5a1b557281204964f37e81cb0776758360029555
Component: engine
2016-11-10 13:52:22 -08:00
1039b39798 Merge pull request #27116 from cpuguy83/22564_fix_volume_unmount
Fix uneccessary calls to `volume.Unmount()`
Upstream-commit: f3864bcd3406c963395f6de9cdc7172c0daa1f5d
Component: engine
2016-11-10 13:48:44 -08:00
4d22d82151 api: Service Logs support
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 819d0159bbda1b3ae53bdaa9a3e62ac98497e24c
Component: engine
2016-11-10 13:46:02 -08:00
2e628cd947 Add local address autodetection on swarm init
- when advertise-addr is not local and listen-addr is
  not specified

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c8d0cb9e716585f33dc730911332adbbc458513a
Component: engine
2016-11-10 13:45:32 -08:00
ef501816c9 Merge pull request #27797 from vdemeester/stats-format-names-support
Add support for Names and ID in stats format
Upstream-commit: 801230ce315ef51425da53cc5712eb6063deee95
Component: engine
2016-11-10 13:26:00 -08:00
881cd023ce Merge pull request #27753 from tonistiigi/fix-overlay-unmount
Fix overlay unmount for the root case
Upstream-commit: 1883b73a573fff613f944bb83e24db14d839902c
Component: engine
2016-11-10 13:14:45 -08:00
e93ab8dcb4 cluster executor: Logs retrieving support.
Plumbed the executor to the container logs backend.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 0ec68657139f029e2740780a58e0019df0e42b6a
Component: engine
2016-11-10 12:02:47 -08:00
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
1689aa276d Fix uneccessary calls to volume.Unmount()
Fixes #22564

When an error occurs on mount, there should not be any call later to
unmount. This can throw off refcounting in the underlying driver
unexpectedly.

Consider these two cases:

```
$ docker run -v foo:/bar busybox true
```

```
$ docker run -v foo:/bar -w /foo busybox true
```

In the first case, if mounting `foo` fails, the volume driver will not
get a call to unmount (this is the incorrect behavior).

In the second case, the volume driver will not get a call to unmount
(correct behavior).

This occurs because in the first case, `/bar` does not exist in the
container, and as such there is no call to `volume.Mount()` during the
`create` phase. It will error out during the `start` phase.

In the second case `/bar` is created before dealing with the volume
because of the `-w`. Because of this, when the volume is being setup
docker will try to copy the image path contents in the volume, in which
case it will attempt to mount the volume and fail. This happens during
the `create` phase. This makes it so the container will not be created
(or at least fully created) and the user gets the error on `create`
instead of `start`. The error handling is different in these two phases.

Changed to only send `unmount` if the volume is mounted.

While investigating the cause of the reported issue I found some odd
behavior in unmount calls so I've cleaned those up a bit here as well.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9a2d0bc3adc0c21c82cd1974be45ea0449f9f224
Component: engine
2016-11-10 14:04:08 -05: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
6e2afbaf59 Add flag --host to service create and --host-add/--host-rm to service update
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.

This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.

Related docs has been updated.

An integration test has been added.

This fix fixes 27902.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ea9a23ccdbd3a861e4cfa3441482b448fd1c17a5
Component: engine
2016-11-10 10:20:24 -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
3a6b62c164 Add integration test for stack deploy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: eefccc25c5cda96947978c503d5764aa48aacd7d
Component: engine
2016-11-10 11:28:18 -05:00
38597e8d2b Fix hostname support for compose file
Pass the hostname from ContainerSpec to the actual container.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d0117238fa74ea75cdec7b9205620c59bafc4508
Component: engine
2016-11-10 11:28:18 -05: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