Commit Graph

31121 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 137edd889c Merge pull request #32339 from aluzzardi/selinux
services: Add support for Credential Spec and SELinux
Upstream-commit: 091b5e68ea735bf4e8ece708bbc8c413a32eab73
Component: engine
2017-04-08 01:37:17 +02:00
Alessandro Boch 66de9b1120 Vendoring libnetwork @ab8f7e6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 60c36f88a5aaa051f111c96d0fb10fd6542f5f2e
Component: engine
2017-04-07 16:35:29 -07:00
Victor Vieux d557530da5 clarify docker plugin set docs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a412ad41a59cbb892e4527b9d8fc835b237bb0e7
Component: engine
2017-04-07 16:35:05 -07:00
Brian Goff ddc6479238 Merge pull request #32154 from dperny/refactor-logs
Refactor logs and support service logs with TTY 
Upstream-commit: 4a1a64c67768d6fbcf20a1b37ee58212b7e870c6
Component: engine
2017-04-07 18:06:50 -04:00
Daniel Nephin 8c6400b4e4 Refactor BuildArgs
Add MetaArgs for ARG that occur before the first FROM
Integration test for these cases.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 239c53bf836174108dbae445a394a290f5fe2898
Component: engine
2017-04-07 17:57:47 -04:00
Daniel Nephin bc5cfcbd12 Fix arg in from when arg is not defined
Add mock builder backend
Add tests for ARG in FROM

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b4aa7629c527bc2076de984e77627757f20db68
Component: engine
2017-04-07 17:57:47 -04:00
Daniel Nephin d6d79998e2 Allow ARG to come before FROM to support variables in FROM.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f0a9c2e3f4ea101c8a56a31ae6cb11559bc78683
Component: engine
2017-04-07 17:57:47 -04:00
Evan Hazlett b5aca33d88 Merge pull request #32435 from thaJeztah/add-ubuntu-17.04-zesty
Add Ubuntu 17.04 Zesty Zapus
Upstream-commit: b3a66a4a286d329ac3530992fd132305ae563e4f
Component: engine
2017-04-07 14:50:56 -05:00
Andrea Luzzardi e41369fcc4 services: Add support for Credential Spec and SELinux
- Defined "normalized" type for Credential Spec and SELinux
- Added --credential-spec to docker service create & update
- SELinux is API only at the time

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 89a995a9d77cc4f95a29579e0a2b12cb3d805749
Component: engine
2017-04-07 11:30:54 -07:00
Vincent Demeester 593669c329 Merge pull request #32283 from aboch/clearingress
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
Upstream-commit: 87562af45bf32efce55d9fceb141a655b82a33c4
Component: engine
2017-04-07 20:09:27 +02:00
Daniel Nephin 9156acdd4f Add support for volume consistency in compose format.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ae27355b095181748daa1d68d07f8e45904b14cc
Component: engine
2017-04-07 13:23:33 -04:00
Simon Ferquel 4c321e8e20 Test and fix forbidden path for COPY --from on Windows
Paths resolving to c:\ or c:\windows are forbidden

Replaced the obscure (and non-working) regex with a simple case
insensitive comparison to the black listed paths (we should forbid c:\,
c:\windows but not d:\)

Also, add a test ensuring paths are case insensitive on windows

Also, made sure existing multi-staged build tests pass on windows

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
Upstream-commit: b0e75888738f6e427b545922a195837c00158749
Component: engine
2017-04-07 18:00:36 +02:00
Daniel Nephin a264afe36f Merge pull request #32430 from allencloud/add-hosts-example-for-serviceSpec-in-swagger-yml
add hosts example for serviceSpec in swagger.yml
Upstream-commit: 9fe781a333e284cc9538474a72ff5f85e971bdac
Component: engine
2017-04-07 11:47:36 -04:00
Sebastiaan van Stijn e48f925bda Fix tini version parsing
Invalid version strings for the init (tini)
binary were still accepted, which lead to (e.g.)

"hello world"

Being used as "vhello world"

This makes the version parsing slightly stricter

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 984d99e19cd5fbc6889528c9588f4875e3c40cc5
Component: engine
2017-04-07 17:12:07 +02:00
Vincent Demeester 072232e704 Merge pull request #32289 from adshmh/add-unit-tests-for-cli-command-secret-package
add unit tests for package cli/command/secret
Upstream-commit: 8b9d54c084c951f57219de706ddb45fc2305ca89
Component: engine
2017-04-07 15:26:40 +02:00
Sebastiaan van Stijn 8737950bfd Add Ubuntu 17.04 Zesty Zapus
Ubuntu 17.04 will be released soon http://releases.ubuntu.com/zesty/

Note that this is a short-term release, so will
EOL (and removed again) in 9 months

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a8c714a7c01e76391fa50e57dce9986091b1c79a
Component: engine
2017-04-07 13:58:44 +02:00
allencloud 14ad9e03e4 add hosts example for serviceSpec in swagger.yml
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 412099baa9605149f58d1fe442a80c67bf7e3baa
Component: engine
2017-04-07 17:06:52 +08:00
Vincent Demeester ed5e7bb984 Merge pull request #32425 from tabakhase/patch-1
Fix install.sh of get.docker.com for debian-sudo
Upstream-commit: daaf9ddfa9a53fb82511accb8ad0fed381670a54
Component: engine
2017-04-07 10:08:28 +02:00
Arash Deshmeh 1f0e0155dc use an encrypted client certificate to connect to a docker daemon
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 603dd8b3b48273c0c7e1f2aef5f344acac66424e
Component: engine
2017-04-07 01:50:51 -04:00
Arash Deshmeh 09386ff2b9 vendor docker/go-connections to include the enhacement for decrypting keys
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 7180f887ea4204a4a99f0de85ada64cac15856d7
Component: engine
2017-04-07 01:50:50 -04:00
Tabakhase 9908272490 Fix install.sh of get.docker.com for debian-sudo
repair sudo call on key-add for install / https://get.docker.com/

fix #32424

Signed-off-by: Tabakhase <github@tabakhase.com>
Upstream-commit: a704d06d581e880b81189567919642ae36442bd0
Component: engine
2017-04-07 05:07:22 +02:00
Brian Goff f6c6c2dac3 Merge pull request #30261 from aaronlehmann/rollout-mode
swarm: Add update/rollback order
Upstream-commit: 3de58eb2bca720be0f5940cdd928de7a96220174
Component: engine
2017-04-06 22:41:11 -04:00
Brian Goff be0fe36691 Merge pull request #30669 from catinthesky/issue30580
Fixing issue of docker top command failure when dealing with -m option
Upstream-commit: 7d8bf5d177127c61208e397bf8cf53b2f52ac9e7
Component: engine
2017-04-06 21:14:26 -04:00
Drew Erny 334f054f13 refactor logs and support service logs /w tty
Refactor container logs system to make communicating log messages
internally much simpler. Move responsibility for marshalling log
messages into the REST server. Support TTY logs. Pave the way for fixing
the ambiguous bytestream format. Pave the way for fixing details.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 1044093bb0aa12eb8972361a93b9bc8c4ddd857b
Component: engine
2017-04-06 17:54:11 -07:00
Aaron Lehmann 9cc90bfd8d Add integration test for START_FIRST update order
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6763641d6932468a0503516bb32e39202989aa52
Component: engine
2017-04-06 17:23:36 -07:00
Aaron Lehmann 1623433ab1 Add support for update order
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.

This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9b54994a8ada6ae15a4d2c3b925568e2061200ad
Component: engine
2017-04-06 17:23:36 -07:00
Anusha Ragunathan 65ae5270f9 Merge pull request #32412 from anusha-ragunathan/plugin-enable
Add an initial smaller sleep time before net dialing plugin socket.
Upstream-commit: ad416fc311e947a6af05625d74ce3b3d92de2c94
Component: engine
2017-04-06 16:38:41 -07:00
Yong Tang ba4f1c70ab Add --cpus support for docker update
This fix tries to address the issue raised in 31032 where it was
not possible to specify `--cpus` for `docker update`.

This fix adds `--cpus` support for `docker update`. In case both
`--cpus` and `--cpu-period/--cpu-quota` have been specified,
an error will be returned.

Related docs has been updated.

Integration tests have been added.

This fix fixes 31032.

This fix is related to 27921, 27958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 61022436926a8d0c92068e8116a2ad77f43eb6d6
Component: engine
2017-04-06 15:40:12 -07:00
Brian Goff a532c2b899 Merge pull request #32407 from dnephin/fix-rw-mode-compose-files
Support rw as a volume option in compose file
Upstream-commit: 30cdabd13f5cbb09370c3db3f5c7d1384043f3f4
Component: engine
2017-04-06 16:24:20 -04:00
Anusha Ragunathan 6469db0655 Merge pull request #32391 from aaronlehmann/no-stack-traces
api: Don't include stack traces with errors
Upstream-commit: 106a9a7d72427e9ceb6ca96bce6d96f6c822ce1c
Component: engine
2017-04-06 13:10:34 -07:00
Sebastiaan van Stijn a57f229b8d Merge pull request #31867 from vieux/fix_bash_warning
fix bash error in release.sh
Upstream-commit: e49652c6f8fc0d115a567098b8c308f085963b8c
Component: engine
2017-04-06 21:45:00 +02:00
Tianon Gravi 0827c488f7 Update SKIP_RELEASE_BUILD to only check for the string "1" (so it has to be exactly "SKIP_RELEASE_BUILD=1" to skip the release build)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a7ddc9d7e6c14494e7ab3fa80d07b1b371c6ec5b
Component: engine
2017-04-06 11:56:26 -07:00
Anusha Ragunathan 270cc52d25 Add an initial smaller sleep time before net dialing plugin socket.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 891f9acb7b4e868df74c0f674eb84780e4e04149
Component: engine
2017-04-06 11:16:35 -07:00
Daniel Nephin 4adfcf1302 Upadte archive.ReplaceFileTarWrapper() to not expect a sorted archive
Improve test coverage of ReplaceFileTarWrapper()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8cd6c30a489f7a0210526b0f94469c525ba8e0ee
Component: engine
2017-04-06 13:36:34 -04:00
Sebastiaan van Stijn 6f724a82a6 Merge pull request #28938 from elifa/master
Grace period option to health checks.
Upstream-commit: c4010e257f60d4204c5c2f5dc5a8aa5313d1b254
Component: engine
2017-04-06 19:23:56 +02:00
Yong Tang 83d9648a45 Add label filter for docker system prune
This fix tries to address the issue raised in 29999 where it was not
possible to mask these items (like important non-removable stuff)
from `docker system prune`.

This fix adds `label` and `label!` field for `--filter` in `system prune`,
so that it is possible to selectively prune items like:
```
$ docker container prune --filter label=foo

$ docker container prune --filter label!=bar
```

Additional unit tests and integration tests have been added.

This fix fixes 29999.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 702524732427ce028277f99f215e1fab297e6001
Component: engine
2017-04-06 09:11:25 -07:00
Tõnis Tiigi 63121bcc21 Merge pull request #32401 from ijc25/gotty-terminfo-fixes
Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2
Upstream-commit: e4c608abe99b0ca2a1a454792780da8f59674f12
Component: engine
2017-04-06 09:01:30 -07:00
Daniel Nephin 0d79f39f39 Support rw as a volume option in compose file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 062830535df4d944fd8e4d626f3da5bdc7b1993a
Component: engine
2017-04-06 10:32:35 -04:00
Brian Goff d862a42e27 Merge pull request #32387 from Microsoft/jjh/tidystat
Tidy pkg\system *stat* functions
Upstream-commit: fa3e2d5ab9b577cecd24201902bbe72b3f1b851c
Component: engine
2017-04-06 08:40:27 -04:00
Vincent Demeester d9412325fb Merge pull request #32364 from aaronlehmann/preserve-env-order
cli: Preserve order of environment variables
Upstream-commit: f5d881b835fbc12fdb4b0840ab26333170c705f3
Component: engine
2017-04-06 14:25:29 +02:00
Ian Campbell f9282bea00 Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2
This fixes https://github.com/docker/docker/issues/32400

We were already actually vendoring from github.com/ijc25/Gotty in order to
pickup github.com/Nvveen/Gotty#1. github.com/ijc25/Gotty#master now contains
merges of both of those upstream PRs.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: b7ced33036f24852e7d8095c7f38f5bb8d2b8ef9
Component: engine
2017-04-06 12:19:32 +01:00
Elias Faxö e25f6c5a1b Added start period option to health check.
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
2017-04-06 12:35:34 +02:00
Sebastiaan van Stijn 859b7948a5 Merge pull request #32395 from prertik/master
updated experimental/Readme.md with fixed deadlinks
Upstream-commit: 5b18e7c3962dfbe472199fc5e868d02de6dac40c
Component: engine
2017-04-06 09:01:27 +02:00
Pratik Karki 3b00f427b7 updated Readme.md with fixed deadlinks
Signed-off-by: prertik <prertik@outlook.com>
Upstream-commit: 718847c742107a3b6fe4a172f7fa63ed559d69ae
Component: engine
2017-04-06 12:31:18 +05:45
Akihiro Suda 1598da861b Merge pull request #32392 from aluzzardi/revendor-swarmkit
[master] Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
Upstream-commit: 2aed764baff9c76a51689164c2cce7f54dbcf88b
Component: engine
2017-04-06 13:18:17 +09:00
Brian Goff 2b71862e00 Merge pull request #32383 from Microsoft/jjh/removeunused
Windows: Remove unused process_windows.go
Upstream-commit: 9691170de99cf2e306640ec64f2c9d787100dfa9
Component: engine
2017-04-05 23:32:40 -04:00
Andrea Luzzardi 7647ce4c36 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 367b57d9859d2e3b4a651eb31d2d17f425329783
Component: engine
2017-04-05 18:49:23 -07:00
Aaron Lehmann 75b06f1d80 api: Don't include stack traces with errors
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7381fffb2f0a0307ef1575a299028d036f24088f
Component: engine
2017-04-05 18:13:58 -07:00
Daniel Nephin 3712bab8c4 Factor out adding dockerfile from stdin.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 56bf6de9f7f0d8e35a5170faf0c35ad07c89d04c
Component: engine
2017-04-05 19:42:31 -04:00
David Sheets 06ea8bf159 build: accept -f - to read Dockerfile from stdin
Heavily based on implementation by David Sheets

Signed-off-by: David Sheets <sheets@alum.mit.edu>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3f6dc81e10b8b813fffaa9b4167a60c5a507fa38
Component: engine
2017-04-05 19:42:31 -04:00