beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31924 commits 14 branches 412 tags 338 MiB
Commit graph

31924 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Murdaca
b11af7b2f6
daemon: relabel secrets path 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-04-11 17:43:23 +02:00
Sebastiaan van Stijn
8d25490145 Merge pull request #32523 from albers/typo-api-version-history 
Fix typo in version-history.md
 2017-04-11 15:44:41 +02:00
Harald Albers
269df77be2 Fix typo in version-history.md 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-11 15:39:01 +02:00
Sebastiaan van Stijn
a258ef58d8 Merge pull request #32284 from aaronlehmann/fix-service-defaults 
Improve default handling for "service create"
 2017-04-11 13:06:53 +02:00
Vincent Demeester
5e9a0efec7 Merge pull request #32514 from albers/completion-multiple-stack-rm 
Bash completion supports multiple stacks in `stack rm`
 2017-04-11 11:31:39 +02:00
Akihiro Suda
8d53fb5172 Merge pull request #32511 from mkumatag/remove_mock_vendor 
Remove unused github.com/golang/mock from vendor.conf
 2017-04-11 17:54:35 +09:00
Harald Albers
dc0523313e Bash completion supports multiple stacks in stack rm 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-11 08:29:55 +02:00
Akihiro Suda
b764c471bf Merge pull request #32495 from dnephin/cleanup-builder-dispatcher-env 
Remove Builder.dockerfile field
 2017-04-11 14:50:55 +09:00
Manjunath A Kumatagi
30a1625002 Remove unused github.com/golang/mock 
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
 2017-04-11 10:20:16 +05:30
Victor Vieux
a6746e6ca5 Merge pull request #31954 from darrenstahlmsft/GraphdriverReference 
Windows: Fix reference counting in graphdriver
 2017-04-10 20:23:15 -07:00
Victor Vieux
18ae574cab Merge pull request #32496 from tonistiigi/build-target 
builder: add an option for specifying build target
 2017-04-10 19:02:21 -07:00
Victor Vieux
17a3e4511d Merge pull request #32462 from dperny/service-logs-general-availability 
Remove experimental from service logs
 2017-04-10 18:30:20 -07:00
Victor Vieux
74093fe4ca Merge pull request #32092 from alfred-landrum/gdcaps 
Let graphdrivers declare diff stream fidelity
 2017-04-10 18:20:32 -07:00
Victor Vieux
3a9572ca14 Merge pull request #32110 from adshmh/30977-stack-rm-should-accept-multiple-labels 
stack rm should accept multiple arguments
 2017-04-10 18:19:59 -07:00
Darren Stahl
7fab9b8a60 Windows: Fix reference counting in graphdriver 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-04-10 17:13:17 -07:00
Tonis Tiigi
33e07f41ad builder: add an option for specifying build target 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-10 16:21:43 -07:00
Victor Vieux
2c6bcf3ee7 Merge pull request #32497 from thaJeztah/master-update-changelog 
[master] update changelog with 17.04.0 changes
 2017-04-10 16:02:38 -07:00
Victor Vieux
3569dac3c0
bump to rc2 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 2f35d73b7d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-11 00:58:34 +02:00
Vincent Demeester
9c2f8febaf
Merge pull request #31848 from thaJeztah/17.04.0-changelog-updates 
[17.04.x] deprecation and changelog updates
(cherry picked from commit f15f593751)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-11 00:57:37 +02:00
Victor Vieux
d55ec07acd
Merge pull request #31811 from vieux/bump_17.04.0 
bump 17.04.0-rc1
(cherry picked from commit b2fc918c5a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-11 00:57:19 +02:00
Daniel Nephin
f3e205ddc1 Remove the dockerfile field from Builder. 
Return dockerfile from parseDockerfile and pass the dockerfile nodes
as an arg

Strip unused arg from builder.NewBuilder.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-10 18:09:17 -04:00
Victor Vieux
7da7fc3ad0 Merge pull request #32492 from icecrime/update_gitdm_domain-map 
Update gitdm domain-map
 2017-04-10 14:54:12 -07:00
Arnaud Porterie (icecrime)
bfb6815f48 Update gitdm domain-map 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2017-04-10 14:28:27 -07:00
Brian Goff
5f7150059f Merge pull request #32485 from albers/completion-node-ls--filter 
Add bash completion for `node ls --format`
 2017-04-10 17:04:20 -04:00
Sebastiaan van Stijn
ec207ce186 Merge pull request #32116 from mkumatag/inspect_template 
Adopt text/template in node inspect
 2017-04-10 23:02:26 +02:00
Aaron Lehmann
bbe1202410 Make the CLI show defaults from the swarmkit defaults package 
If no fields related to an update config or restart policy are
specified, these structs should not be created as part of the service,
to avoid hardcoding the current defaults.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-10 13:41:18 -07:00
Aaron Lehmann
1d274e9acf Change "service inspect" to show defaults in place of empty fields 
This adds a new parameter insertDefaults to /services/{id}. When this is
set, an empty field (such as UpdateConfig) will be populated with
default values in the API response. Make "service inspect" use this, so
that empty fields do not result in missing information when inspecting a
service.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-10 13:41:16 -07:00
Drew Erny
306cfecc8c Remove experimental from service logs 
Service logs API is now stable. Service logs now support all features,
except retrieving details provided to the log driver.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-04-10 13:40:45 -07:00
Sebastiaan van Stijn
129d1f7051 Merge pull request #32479 from aboch/vnd 
Do not error out on serv bind deactivation if no sbox is found
 2017-04-10 22:16:04 +02:00
Sebastiaan van Stijn
28334c1d82 Merge pull request #28403 from cpuguy83/logging_plugins 
Implement plugins for logging drivers
 2017-04-10 21:57:56 +02:00
Harald Albers
ef77f002e7 Add bash completion for node ls --format 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-10 12:57:32 -07:00
Sebastiaan van Stijn
9b2ac77f64 Merge pull request #31877 from albers/completion-update--cpus 
Add bash completion for `update --cpus`
 2017-04-10 21:43:16 +02:00
Vincent Demeester
778e32a2fa Merge pull request #31236 from tonistiigi/docker-stdin 
build: accept -f - to read Dockerfile from stdin
 2017-04-10 20:14:54 +02:00
Sebastiaan van Stijn
5b1cae2271 Merge pull request #31148 from yongtang/31032-NanoCPU-update 
Add `--cpus` support for `docker update`
 2017-04-10 20:02:15 +02:00
Vincent Demeester
4460312ce1 Merge pull request #30740 from yongtang/29999-prune-filter-label 
Add `label` filter for `docker system prune`
 2017-04-10 19:38:01 +02:00
Daniel Nephin
4d9e32a08e Merge pull request #31352 from dnephin/allow-arg-in-fromt 
[dockerfile] Allow ARG in FROM
 2017-04-10 13:23:40 -04:00
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