Commit Graph

30027 Commits

Author SHA1 Message Date
a5328df4bd Merge pull request #32084 from simonferquel/multi-stage-builds-windows
Multi stage builds cleanup for Windows
Upstream-commit: a48f4257f0af5259584b69ed32b1bd9152d0a74c
Component: engine
2017-04-10 17:36:36 +02:00
49adc43a40 Merge pull request #32285 from dmcgowan/revert-fix-for-flaky-misconfigured-token-test
Revert change to TestPushMisconfiguredTokenServiceResponseError
Upstream-commit: 61d3ddfe780b58b69b8af4f2bbb4312b7b0f71a1
Component: engine
2017-04-10 16:34:58 +02:00
b73616e986 Merge pull request #32469 from darkowlzz/32314-fix-default-init-binary-value
Fix missing Init Binary in docker info output
Upstream-commit: d291888047fedcabbcc453b21049d217294fa5f3
Component: engine
2017-04-10 09:55:23 -04:00
f8815ca306 Added word to documentation
Improved documentation by adding word for better sentence structure.

Signed-off-by: Mike Casas <mkcsas0@gmail.com>
Upstream-commit: eb6a3e8361dc48037ff3e29f5802bd21782cb645
Component: engine
2017-04-10 09:14:01 -04:00
b91fdec82e Merge pull request #32362 from tonistiigi/multi-stage-build-docs
Add docs for multi-stage builds
Upstream-commit: 2ba9783d1a50a519a42e69dbfa7b3b0755938a25
Component: engine
2017-04-10 14:26:08 +02:00
3d6e7463ee Fix missing Init Binary in docker info output
- Moved DefaultInitBinary from daemon/daemon.go to
daemon/config/config.go since it's a daemon config and is referred in
config package files.
- Added condition in GetInitPath to check for any explicitly configured
DefaultInitBinary. If not, the default value of DefaultInitBinary is
returned.
- Changed all references of DefaultInitBinary to refer to the variable
from new location.
- Added TestCommonUnixGetInitPath to test for the various values of
GetInitPath.

Fixes #32314

Signed-off-by: Sunny Gogoi <indiasuny000@gmail.com>
Upstream-commit: 17b128876028022991e2dbcb2cc402cc81b451e5
Component: engine
2017-04-10 16:54:07 +05:30
73fce35ed0 Merge pull request #32062 from aaronlehmann/change-network-attachments
Support service network attachment changes
Upstream-commit: b0831acb09662431ecfed84677e7f5ed54635d52
Component: engine
2017-04-10 12:49:28 +02:00
04adcf44c3 Merge pull request #31364 from adshmh/30935-use-encrypted-client-certificate-to-connect-to-a-docker-host
use an encrypted client certificate to connect to a docker daemon
Upstream-commit: 2daa2b894c1cf62936fe55dc8782c486aafaecdd
Component: engine
2017-04-10 10:42:01 +02:00
88cdacca6c Add docs for named build stages
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 877ac98e44f2b1d9af6319ca07d232a3cd929d39
Component: engine
2017-04-09 20:40:50 -07:00
f4a661bcfe Merge pull request #32447 from aboch/vnd
Fix container no ipv6 when run container on --network=host
Upstream-commit: 9f27f0dcd3b8953a53f20e3f29f493d876b56941
Component: engine
2017-04-09 15:07:58 -07:00
062fe4952a Merge pull request #32055 from FabianLauer/so-counters
Update stackoverflow question count
Upstream-commit: 9585d0ea19859c5f145bc763d474190447b91c7b
Component: engine
2017-04-09 23:05:09 +02:00
e8ce53d1e2 Update stackoverflow.com install counters
There's ~27k questions by now, not just 7k  😉

Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de>

README.md & CONTRIBTUTING.md: Use word `thousand` instead of numbers

27000 -> 27 thousand

Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de>

README+CONTRIB: No specific number of SO questions

Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de>

CONTRIBUTING.md: Remove unnecessary word

Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de>
Upstream-commit: 012e5c2d1b99899c27a9d673b5d22b83db05f5c8
Component: engine
2017-04-09 09:19:06 +02:00
c7be93cd96 Merge pull request #32436 from thaJeztah/refactor-tiny-version-parsing
Refactor tiny version parsing
Upstream-commit: 51aa2a226e21e20c5b4634a28245c760f4e18f37
Component: engine
2017-04-08 17:36:40 +02:00
82daf40462 Merge pull request #32448 from aaronlehmann/vendor-swarmkit-d5232280
Vendor swarmkit d5232280
Upstream-commit: 46c9df652d26a806945a9ae841dfc499ead6bf17
Component: engine
2017-04-08 09:42:52 -04:00
36c4c39157 Refactor "init" version parsing, and add unit-test
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 72eddf4258db8c10b145ded188d13c50e4a5530b
Component: engine
2017-04-08 11:28:37 +02:00
cb5c83df55 Merge pull request #32409 from dnephin/support-consistency-params-in-compose
Add support for volume consistency in compose format
Upstream-commit: fc6d8fb94d2d9070e58d83dbf13f40c0efa715e3
Component: engine
2017-04-07 17:26:50 -07:00
974796cc86 Vendor swarmkit d5232280
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: ff068989303269fcd2912cac94adff12c6167ab5
Component: engine
2017-04-07 17:10:16 -07:00
7de8729d6d Add test over ipv6 and container run in host network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 010e5a228a633c6854ac28de62d5338c9206e80c
Component: engine
2017-04-07 16:58:20 -07:00
a3c060c71a Merge pull request #32103 from vieux/improve_set_docs
clarify docker plugin set docs
Upstream-commit: 488ad693c0bc6ca6d2b0c0c9b467255fcccc023f
Component: engine
2017-04-07 16:46:50 -07:00
b9faf048c8 Show network names in "docker service inspect --pretty"
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 56f1da77c33dcc5e752dce2694887878f93ffea6
Component: engine
2017-04-07 16:46:25 -07:00
f7bf680f7a cli: Deploying a compose file must use TaskTemplate.Networks
This is the non-deprecated field, and the one that can be changed in a
service update.

Since old daemon versions don't allow migrating from one field to the
other, make this conditional on the API version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b8e70747c625998c6e0678b79c51645de814a7c6
Component: engine
2017-04-07 16:46:25 -07:00
499e804f82 cli: Allow service's networks to be updated
Resolve networks IDs on the client side.

Avoid filling in deprecated Spec.Networks field.

Sort networks in the TaskSpec for update stability.

Add an integration test for changing service networks.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0f2669a63834844fb0ef5c017f517d8c321ad3c7
Component: engine
2017-04-07 16:46:25 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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