Commit graph

31938 commits

Author SHA1 Message Date
Brian Goff
27bd6842f8 Implement plugins for logging drivers
Logging plugins use the same HTTP interface as other plugins for basic
command operations meanwhile actual logging operations are handled (on
Unix) via a fifo.

The plugin interface looks like so:

```go
type loggingPlugin interface {
  StartLogging(fifoPath string, loggingContext Context) error
  StopLogging(fifoPath)
```

This means a plugin must implement `LoggingDriver.StartLogging` and
`LoggingDriver.StopLogging` endpoints and be able to consume the passed
in fifo.

Logs are sent via stream encoder to the fifo encoded with protobuf.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-04-10 13:17:20 -04:00
Daniel Nephin
a5b9d99b9e Merge pull request #32427 from adshmh/add-unit-tests-to-cli-command-idresolver-package
Added unit tests to the cli/command/idresolver package
2017-04-10 12:41:09 -04:00
Alessandro Boch
2418f25767 Do not error out on serv bind deactivation if no sbox is found
- If the nw sbox is not there, then there is nothing to deactivate.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-04-10 09:13:41 -07:00
Brian Goff
8fabe07982 Merge pull request #32450 from miaoyq/fixed-a-bug-of-multireader
Reset the positions for all readers of multireader before reading the data
2017-04-10 11:39:47 -04:00
Vincent Demeester
a48f4257f0 Merge pull request #32084 from simonferquel/multi-stage-builds-windows
Multi stage builds cleanup for Windows
2017-04-10 17:36:36 +02:00
Sebastiaan van Stijn
61d3ddfe78 Merge pull request #32285 from dmcgowan/revert-fix-for-flaky-misconfigured-token-test
Revert change to TestPushMisconfiguredTokenServiceResponseError
2017-04-10 16:34:58 +02:00
Brian Goff
d291888047 Merge pull request #32469 from darkowlzz/32314-fix-default-init-binary-value
Fix missing Init Binary in docker info output
2017-04-10 09:55:23 -04:00
Doug Davis
1727e8179c Merge pull request #32475 from mikecasas/patch-2
Added word to documentation
2017-04-10 09:28:12 -04:00
Mike Casas
eb6a3e8361 Added word to documentation
Improved documentation by adding word for better sentence structure.

Signed-off-by: Mike Casas <mkcsas0@gmail.com>
2017-04-10 09:14:01 -04:00
Vincent Demeester
2ba9783d1a Merge pull request #32362 from tonistiigi/multi-stage-build-docs
Add docs for multi-stage builds
2017-04-10 14:26:08 +02:00
Manjunath A Kumatagi
5dbd6afb51 Adopt text/template in node inspect
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
2017-04-10 17:47:15 +05:30
Sunny Gogoi
17b1288760 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>
2017-04-10 16:54:07 +05:30
Sebastiaan van Stijn
b0831acb09 Merge pull request #32062 from aaronlehmann/change-network-attachments
Support service network attachment changes
2017-04-10 12:49:28 +02:00
Sebastiaan van Stijn
2daa2b894c 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
2017-04-10 10:42:01 +02:00
Tonis Tiigi
877ac98e44 Add docs for named build stages
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-09 20:40:50 -07:00
Madhu Venugopal
9f27f0dcd3 Merge pull request #32447 from aboch/vnd
Fix container no ipv6 when run container on --network=host
2017-04-09 15:07:58 -07:00
Sebastiaan van Stijn
9585d0ea19 Merge pull request #32055 from FabianLauer/so-counters
Update stackoverflow question count
2017-04-09 23:05:09 +02:00
Fabian Lauer
012e5c2d1b 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>
2017-04-09 09:19:06 +02:00
Sebastiaan van Stijn
51aa2a226e Merge pull request #32436 from thaJeztah/refactor-tiny-version-parsing
Refactor tiny version parsing
2017-04-08 17:36:40 +02:00
Brian Goff
46c9df652d Merge pull request #32448 from aaronlehmann/vendor-swarmkit-d5232280
Vendor swarmkit d5232280
2017-04-08 09:42:52 -04:00
Sebastiaan van Stijn
72eddf4258
Refactor "init" version parsing, and add unit-test
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-08 11:28:37 +02:00
Yanqiang Miao
fd06bd6f96 Reset the position of all readers before reading the data
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-08 13:38:15 +08:00
Arash Deshmeh
32486385e6 Added unit tests to the cli/command/idresolver package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-04-07 23:23:39 -04:00
Victor Vieux
fc6d8fb94d Merge pull request #32409 from dnephin/support-consistency-params-in-compose
Add support for volume consistency in compose format
2017-04-07 17:26:50 -07:00
Aaron Lehmann
ff06898930 Vendor swarmkit d5232280
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-07 17:10:16 -07:00
Alessandro Boch
010e5a228a Add test over ipv6 and container run in host network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-04-07 16:58:20 -07:00
Anusha Ragunathan
488ad693c0 Merge pull request #32103 from vieux/improve_set_docs
clarify docker plugin set docs
2017-04-07 16:46:50 -07:00
Aaron Lehmann
56f1da77c3 Show network names in "docker service inspect --pretty"
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-07 16:46:25 -07:00
Aaron Lehmann
b8e70747c6 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>
2017-04-07 16:46:25 -07:00
Aaron Lehmann
0f2669a638 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>
2017-04-07 16:46:25 -07:00
Sebastiaan van Stijn
091b5e68ea Merge pull request #32339 from aluzzardi/selinux
services: Add support for Credential Spec and SELinux
2017-04-08 01:37:17 +02:00
Alessandro Boch
60c36f88a5 Vendoring libnetwork @ab8f7e6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-04-07 16:35:29 -07:00
Victor Vieux
a412ad41a5 clarify docker plugin set docs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-07 16:35:05 -07:00
Brian Goff
4a1a64c677 Merge pull request #32154 from dperny/refactor-logs
Refactor logs and support service logs with TTY
2017-04-07 18:06:50 -04:00
Daniel Nephin
239c53bf83 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>
2017-04-07 17:57:47 -04:00
Daniel Nephin
9b4aa7629c 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>
2017-04-07 17:57:47 -04:00
Daniel Nephin
f0a9c2e3f4 Allow ARG to come before FROM to support variables in FROM.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-07 17:57:47 -04:00
Evan Hazlett
b3a66a4a28 Merge pull request #32435 from thaJeztah/add-ubuntu-17.04-zesty
Add Ubuntu 17.04 Zesty Zapus
2017-04-07 14:50:56 -05:00
Andrea Luzzardi
89a995a9d7 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>
2017-04-07 11:30:54 -07:00
Vincent Demeester
87562af45b Merge pull request #32283 from aboch/clearingress
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
2017-04-07 20:09:27 +02:00
Daniel Nephin
ae27355b09 Add support for volume consistency in compose format.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-07 13:23:33 -04:00
Simon Ferquel
b0e7588873 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>
2017-04-07 18:00:36 +02:00
Daniel Nephin
9fe781a333 Merge pull request #32430 from allencloud/add-hosts-example-for-serviceSpec-in-swagger-yml
add hosts example for serviceSpec in swagger.yml
2017-04-07 11:47:36 -04:00
Sebastiaan van Stijn
984d99e19c 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>
2017-04-07 17:12:07 +02:00
Vincent Demeester
8b9d54c084 Merge pull request #32289 from adshmh/add-unit-tests-for-cli-command-secret-package
add unit tests for package cli/command/secret
2017-04-07 15:26:40 +02:00
Sebastiaan van Stijn
a8c714a7c0
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>
2017-04-07 13:58:44 +02:00
allencloud
412099baa9 add hosts example for serviceSpec in swagger.yml
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-04-07 17:06:52 +08:00
Vincent Demeester
daaf9ddfa9 Merge pull request #32425 from tabakhase/patch-1
Fix install.sh of get.docker.com for debian-sudo
2017-04-07 10:08:28 +02:00
Arash Deshmeh
603dd8b3b4 use an encrypted client certificate to connect to a docker daemon
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-04-07 01:50:51 -04:00
Arash Deshmeh
7180f887ea vendor docker/go-connections to include the enhacement for decrypting keys
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-04-07 01:50:50 -04:00