Commit graph

28015 commits

Author SHA1 Message Date
Vincent Demeester
a4125e2265 Merge pull request #27514 from crosbymichael/update-init-oct18
Update docker-init to 74341e923bdf06cfb6b70cf54089
2016-10-20 16:58:26 +02:00
Vincent Demeester
f529f2a0d5 Merge pull request #27535 from YuPengZTE/dev
Fix the typo of URLs
2016-10-20 16:51:50 +02:00
Vincent Demeester
e174a4358d Merge pull request #27465 from anusha-ragunathan/plugins_APIVer
Add plugin API version.
2016-10-20 16:48:26 +02:00
Vincent Demeester
78624ec81a Merge pull request #26671 from yongtang/25545-docker-volume-inspect-volume-options
Show volume options for `docker volume inspect`
2016-10-20 16:10:23 +02:00
Yong Tang
9ce8aac55e Show volume options for docker volume inspect
This fix tries to address the issue raised in 25545 where
volume options at the creation time is not showed up
in `docker volume inspect`.

This fix adds the field `Options` in `Volume` type and
persist the options in volume db so that `volume inspect`
could display the options.

This fix adds a couple of test cases to cover the changes.

This fix fixes 25545.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-20 05:14:27 -07:00
Antonio Murdaca
11d52b085c Merge pull request #27558 from LK4D4/update_go
project: update Go to 1.7.3
2016-10-20 14:13:41 +02:00
Vincent Demeester
1b677816f5 Merge pull request #24594 from jwendell/24355
Exec: Add ability to set environment variables
2016-10-20 13:26:48 +02:00
Sebastiaan van Stijn
f6e9f71e70 Merge pull request #27451 from vincentbernat/fix/zsh-complete-empty
zsh: fix completion when docker output only has the header line
2016-10-19 23:34:16 -07:00
Sebastiaan van Stijn
adaea58b20 Merge pull request #27534 from yuexiao-wang/fix-link-image-repo
Update the link for sharing images via repositories
2016-10-19 20:37:22 -07:00
Sebastiaan van Stijn
5023d3aa7a Merge pull request #27542 from albers/completion-comments
Improve comments in bash completion
2016-10-19 20:36:40 -07:00
Alexander Morozov
7d8831c091 project: update Go to 1.7.3
List of milestone issues https://github.com/golang/go/issues?q=milestone%3AGo1.7.3

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-19 13:55:01 -07:00
yuexiao-wang
e1c849cc57 Update the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-20 01:39:41 +08:00
Tõnis Tiigi
9f30c28d21 Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors
Fix problems with wrapped errors in logrus
2016-10-19 10:16:01 -07:00
Kenfe-Mickaël Laventure
01736b9cbe Merge pull request #27550 from albers/completion-daemon--shutdown-timeout
Add bash completion for `dockerd --shutdown-timeout`
2016-10-19 10:05:07 -07:00
Harald Albers
c24c1bd87f Add bash completion for dockerd --shutdown-timeout
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-19 18:59:01 +02:00
Misty Stanley-Jones
2bf4a39161 Merge pull request #27438 from yuexiao-wang/update-volume
Update the link for understand data volumes
2016-10-19 09:56:05 -07:00
yuexiao-wang
b1c2d425e1 Update the link for understand data volumes
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-20 01:25:59 +08:00
Vincent Demeester
4a4f028c47 Merge pull request #23036 from yongtang/22471-daemon-shutdown-timeout-daemon
Add config parameter to change stop timeout during daemon shutdown
2016-10-19 18:47:50 +02:00
Jonh Wendell
e03bf1221e Exec: Add ability to set environment variables
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
2016-10-19 12:39:25 -02:00
Vincent Demeester
15fb3fd9da Merge pull request #26965 from Microsoft/jjh/rootpath
Windows: Set correct root path logic
2016-10-19 15:50:37 +02:00
Vincent Demeester
7a4d286ddd Merge pull request #27387 from talex5/health-restart
Reset health status to starting when a container is restarted
2016-10-19 15:48:59 +02:00
Vincent Demeester
f279c11a77 Merge pull request #26130 from AkihiroSuda/networkcreationtime
add creation timestamp to `docker network inspect`
2016-10-19 15:48:29 +02:00
Harald Albers
b0987b799e Improve comments in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-19 15:35:56 +02:00
Vincent Demeester
ff43982fbb Merge pull request #27316 from albers/completion-plugins
Align bash completion of plugins to completion of nodes and services
2016-10-19 12:17:12 +02:00
Vincent Demeester
d2ccc8007a Merge pull request #26984 from thaJeztah/update-triage-process
[RFC] Update triage process with more labels
2016-10-19 12:12:50 +02:00
YuPengZTE
fa378413f8 Fix the typo of URLs
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-10-19 17:46:27 +08:00
Sebastiaan van Stijn
f11a588d75 Merge pull request #27501 from aaronlehmann/remove-resolveindex
registry: Remove unused method ResolveIndex
2016-10-19 00:30:55 -07:00
Sebastiaan van Stijn
e319954229 Merge pull request #27523 from lixiaobing10051267/masterInstall
Remove invalid installation content because there is no corresponding files
2016-10-18 23:51:28 -07:00
lixiaobing10051267
9146ac50c4 Remove invalid installtion content because there is no corresponding files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-10-19 15:12:55 +08:00
Akihiro Suda
b5bb7de5d2 add creation timestamp to docker network inspect
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-19 06:38:39 +00:00
Sebastiaan van Stijn
024b97bf0f Merge pull request #27502 from dnephin/fix-dockerd-help-text
Update sfp13/pflag
2016-10-18 23:27:54 -07:00
Sebastiaan van Stijn
74f486cd71 Merge pull request #27520 from dmcgowan/fix-27384
Add limit to page size used by overlay2 driver
2016-10-18 23:11:17 -07:00
Sebastiaan van Stijn
194f04bbbe Merge pull request #27267 from ezrasilvera/plugin_fix
Call the AuthZRes function also when the daemon  returns error
2016-10-18 21:53:43 -07:00
Derek McGowan
520034e35b
Add limit to page size used by overlay2 driver
Go can falsely report a larger page size than supported,
causing overlay2 mount arguments to be truncated. When overlay2
detects the mount arguments have hit the page limit, it will
switch to using relative paths. If this limit is smaller than
the actual page size there is no behavioral problems, but if it
is larger mounts can fail for images with many layers.

Closes #27384

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-10-18 17:34:19 -07:00
Daniel Nephin
4e4da146ec Update sfp13/pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-18 17:17:22 -07:00
Aaron Lehmann
738131faae Fix problems with wrapped errors in logrus
This vendors a fork of logrus with fixes to deal with errors generated
by the github.com/pkg/errors package. Without these fixes, the errors
are mishandled when passed to WithError:

- When printing to a terminal (colors enabled), stack traces are
  included in the error fields on a log line.

- When printing to a file (or with colors disabled), the error value is
  missing entirely.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-18 17:14:59 -07:00
Sebastiaan van Stijn
3b0660da30 Merge pull request #26421 from aaronlehmann/update-thresholds-rollbacks
Service update failure thresholds and rollback
2016-10-18 15:26:24 -07:00
Michael Crosby
3c3ba4cb66 Update docker-init to 74341e923bdf06cfb6b70cf54089
Fixes a bug with background processes after the child process exits.

diff:
74341e923b

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-10-18 14:45:43 -07:00
Daniel Nephin
701cd7996f Merge pull request #27492 from albers/completion-run--stop-timeout
Add bash completion for `docker {run,create} --stop-timeout`
2016-10-18 17:22:47 -04:00
Tianon Gravi
f803114833 Merge pull request #27348 from albers/completion-containers
Improve bash completion of containers
2016-10-18 13:31:47 -07:00
Sebastiaan van Stijn
b17107a84a Merge pull request #27235 from albers/completion-networks
Align bash completion of networks to completion of nodes and services
2016-10-18 13:30:01 -07:00
Alexander Morozov
462cb3855d Merge pull request #27436 from YuPengZTE/devFirst
The first letter should be small in error of remote.go
2016-10-18 12:49:04 -07:00
Alexander Morozov
329f272fd5 Merge pull request #27474 from tagomoris/identify-fluentd-driver-stops-after-restarts
Update fluent-logger-golang to v1.2.1
2016-10-18 12:47:13 -07:00
Alexander Morozov
32156e1758 Merge pull request #27483 from YuPengZTE/devFixLink
Fix the typo of link in devmapper
2016-10-18 12:45:31 -07:00
Alexander Morozov
34e4c5c59f Merge pull request #27489 from caarlos0/cleanup-vendor
cleaning up more stuff in vendor
2016-10-18 12:44:57 -07:00
Tianon Gravi
29cc38da53 Merge pull request #27239 from albers/completion-volumes
Align bash completion of volumes to completion of nodes and services
2016-10-18 12:27:59 -07:00
Aaron Lehmann
19858ff1b1 registry: Remove unused method ResolveIndex
This does not appear to be used.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-18 12:04:10 -07:00
Aaron Lehmann
6d4b527699 Service update failure thresholds and rollback
This adds support for two enhancements to swarm service rolling updates:

- Failure thresholds: In Docker 1.12, a service update could be set up
  to either pause or continue after a single failure occurs. This adds
  an --update-max-failure-ratio flag that controls how many tasks need to
  fail to update for the update as a whole to be considered a failure. A
  counterpart flag, --update-monitor, controls how long to monitor each
  task for a failure after starting it during the update.

- Rollback flag: service update --rollback reverts the service to its
  previous version. If a service update encounters task failures, or
  fails to function properly for some other reason, the user can roll back
  the update.

SwarmKit also has the ability to roll back updates automatically after
hitting the failure thresholds, but we've decided not to expose this in
the Docker API/CLI for now, favoring a workflow where the decision to
roll back is always made by an admin. Depending on user feedback, we may
add a "rollback" option to --update-failure-action in the future.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-18 10:09:50 -07:00
Aaron Lehmann
67bebd6d81 API changes for service rollback and failure threshold
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-18 10:09:30 -07:00
Misty Stanley-Jones
668189e7f0 Merge pull request #27435 from yuexiao-wang/fix-link
Fix a link for feature deprecation policy
2016-10-18 10:04:42 -07:00