Commit Graph

1381 Commits

Author SHA1 Message Date
2f7fc91dd4 Merge pull request #27470 from runcom/expose-exec-pid
record pid of exec'd process
Upstream-commit: 13fd75c3dd18e6d57b6b28097fd7e0d0989c1b9e
Component: engine
2016-10-20 21:36:21 +02:00
1943bac573 Merge pull request #22337 from allencloud/support-insecure-registry-config-reload
support insecure registry in configuration reload
Upstream-commit: c18fbc945514f32379ac2638c3f4fff67e9aa040
Component: engine
2016-10-20 11:41:23 -07:00
5391fe7296 change created description in api change
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c37d6bf2a08c9ae05ebf16522b33b95d389642c1
Component: engine
2016-10-21 00:10:16 +08:00
dd35c23542 record pid of exec'd process
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
2016-10-20 17:06:11 +02:00
6b3066953c 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>
Upstream-commit: 9ce8aac55e6df65bbf49c682374871a94d379bf3
Component: engine
2016-10-20 05:14:27 -07:00
7fbcf96052 Merge pull request #24594 from jwendell/24355
Exec: Add ability to set environment variables
Upstream-commit: 1b677816f50d09650044a7dbda3807bddffdad8d
Component: engine
2016-10-20 13:26:48 +02:00
64bb155742 Merge pull request #27534 from yuexiao-wang/fix-link-image-repo
Update the link for sharing images via repositories
Upstream-commit: adaea58b205e8499c09b6ff35a912fd085ac890f
Component: engine
2016-10-19 20:37:22 -07:00
146d61be30 support insecure registry in configuration reload
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 582803f00addb597efbfc64a5143f2f848b76ae6
Component: engine
2016-10-20 07:54:31 +08:00
4fa4bc496e Update the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: e1c849cc576cf2ee62fb91548aafb74f1a017d2c
Component: engine
2016-10-20 01:39:41 +08:00
5af5baf527 Merge pull request #27438 from yuexiao-wang/update-volume
Update the link for understand data volumes
Upstream-commit: 2bf4a39161d0280066459d1059afbeb20e4eec8d
Component: engine
2016-10-19 09:56:05 -07:00
74ef1fda6a Update the link for understand data volumes
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b1c2d425e167e6f939a192c87a7a40f449f07e32
Component: engine
2016-10-20 01:25:59 +08:00
f6f92180d7 Merge pull request #23036 from yongtang/22471-daemon-shutdown-timeout-daemon
Add config parameter to change stop timeout during daemon shutdown
Upstream-commit: 4a4f028c47046d9b166d35c631ae794000385b70
Component: engine
2016-10-19 18:47:50 +02:00
bf1e1cd730 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>
Upstream-commit: e03bf1221ee2c863f25a57af4d415e2d8ff4f26c
Component: engine
2016-10-19 12:39:25 -02:00
6553369753 Merge pull request #26130 from AkihiroSuda/networkcreationtime
add creation timestamp to `docker network inspect`
Upstream-commit: f279c11a7724abbec80a4cb215dccaeebe13edae
Component: engine
2016-10-19 15:48:29 +02:00
df687714f9 Remove invalid installtion content because there is no corresponding files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 9146ac50c451da95898b216be4fe772168d5edd6
Component: engine
2016-10-19 15:12:55 +08:00
a9ca455bda add creation timestamp to docker network inspect
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b5bb7de5d26a49c8a3789cfcaeb8ff3e6153e708
Component: engine
2016-10-19 06:38:39 +00:00
c0eebabe70 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>
Upstream-commit: 6d4b527699b3e95d21d79f6b327252a6cdaca5b0
Component: engine
2016-10-18 10:09:50 -07:00
11e5249376 Add config parameter to change stop timeout during daemon shutdown
This fix tries to add a daemon config parameter `--shutdown-timeout`
that specifies the timeout value to stop containers gracefully
(before SIGKILL). The default value is 15s.

The `--shutdown-timeout` parameter is added to daemon options and
config file. It will also be updated during daemon reload.

Additional test cases have been added to cover the change.

This fix fixes #22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d7be6b2debb653739a32cfcb7c333ca062f62be0
Component: engine
2016-10-18 08:07:50 -07:00
b507a87735 Fix the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: c76f8ff1d4f0bbc273eca7cba4447b06e2da9c0c
Component: engine
2016-10-18 22:59:18 +08:00
a66c882a3d Merge pull request #27434 from danix800/fix-doc-typos
Fix typos in docs/reference/builder.md.
Upstream-commit: 20be0a6ef788fc2c8dd492751ee25c06d95045df
Component: engine
2016-10-18 15:08:01 +02:00
36ff448ad1 Merge pull request #27481 from yuexiao-wang/fix-link-image-repo
Fix the link for sharing images via repositories
Upstream-commit: 043192137f23b8fb8ca3d41327d452ab475f48c9
Component: engine
2016-10-18 14:54:34 +02:00
a35c353d0b Merge pull request #27476 from yuexiao-wang/fix-typos-volume
Fix some typos
Upstream-commit: 1feaeac65c8968ba2f88a1d2d17e7e775ac2ae18
Component: engine
2016-10-18 13:50:20 +01:00
e13e181560 Merge pull request #27478 from allencloud/wrap-line-in-deleted-containers
wrap line in deleted containers when pruning
Upstream-commit: 1643110ef48e6a7c0cf149d9d0ccf05a52026d10
Component: engine
2016-10-18 13:48:44 +01:00
621e0c851d Merge pull request #22566 from yongtang/22471-daemon-shutdown-timeout
Add config parameter to change per-container stop timeout during daemon shutdown
Upstream-commit: dad8cbfc2d6db45331be2cbd8f9997ab0851fccf
Component: engine
2016-10-18 14:33:09 +02:00
77c700603f Fix typs from go to Go
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 7dad9d5ce45f25750f339642d3b84a81cc2ba98e
Component: engine
2016-10-18 19:40:16 +08:00
96340571d8 Fix typos in docs/reference/builder.md.
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
Upstream-commit: 9ccb1f159e964384df32c083058197340941fafa
Component: engine
2016-10-18 18:05:37 +08:00
b9c927e281 wrap line in deleted containers when pruning
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: dcb4d68092ebca6658923fa4b130ca79e121c760
Component: engine
2016-10-18 14:20:12 +08:00
7035ba1424 Merge pull request #27440 from lixiaobing10051267/masterVolume
fix wrong output title for docker volume ls
Upstream-commit: 0268efc48b86e5cf1c56f2e869f7b66840438ceb
Component: engine
2016-10-17 14:34:24 -07:00
9fc27540de Add config parameter to change per-container stop timeout during daemon shutdown
This fix tries to add a flag `--stop-timeout` to specify the timeout value
(in seconds) for the container to stop before SIGKILL is issued. If stop timeout
is not specified then the default timeout (10s) is used.

Additional test cases have been added to cover the change.

This fix is related to #22471. Another pull request will add `--shutdown-timeout`
to daemon for #22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e66d2108911a2fad016205bdd6bf181f7e822c1c
Component: engine
2016-10-17 12:28:46 -07:00
fcb8f917ad Merge pull request #27429 from thaJeztah/update-api-changelog
Add KernelMemory to API changelog
Upstream-commit: f302226a5ba9cf5d1af4ee5392cd57a71545b80a
Component: engine
2016-10-17 11:11:00 -07:00
314b4d907f Merge pull request #27452 from lucafavatella/fix-typo-in-build-ref
Fix typo in build documentation
Upstream-commit: 92e2a62891c063bc992a5a0afe496a5b1236f6eb
Component: engine
2016-10-17 10:53:36 -07:00
7b84e05ca6 Merge pull request #24771 from aquasecurity/xfs_quota
Implement XFS quota for overlay2
Upstream-commit: 8863a9f62cb16fbdbb318165ffc8140aeb32c597
Component: engine
2016-10-17 09:23:42 -07:00
fe93ff90e7 Fix typo in build documentation
Signed-off-by: Luca Favatella <luca.favatella@erlang-solutions.com>
Upstream-commit: 6dbd1e952b00543dd0c2d57e3dc139ca6de6c94a
Component: engine
2016-10-17 16:48:25 +01:00
e2bcb70dd3 fix wrong output titile for docker volume ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 43023a5428062829c16725e5833da763fc19353a
Component: engine
2016-10-17 17:58:58 +08:00
04d1de1324 Remove Fedora 22 from RPM build as it is EOL
Fedora 22 reached end of life on July 19th, and
will no longer receive updates;

https://fedoramagazine.org/fedora-22-end-of-life-2016-july/

With the recent release of Fedora 24, Fedora 22 will officially enter End Of
Life (EOL) status on July 19th, 2016. After July 19th, all packages in the
Fedora 22 repositories will no longer receive security, bugfix, or enhancement
updates, and no new packages will be added to the Fedora 22 collection.

Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended
for all users still running Fedora 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff405a1d2b9cb7ccbd315e882b6bd7560eb4159c
Component: engine
2016-10-16 21:13:26 -07:00
e551cfbd30 Improve API format examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8e02b29d247379d66280babcf654e467989bd4bb
Component: engine
2016-10-16 19:54:08 -07:00
2d39abd104 Add KernelMemory to API changelog
Commit 9bd8a9b66bb493026599d22c7637909cb460d039
added KernelMemory to the API, but forgot
to include this in the API changelog.

This adds the missing entry in the API
changelog.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f988a9ce5e5926b211c7e762b67cff8e9dbac380
Component: engine
2016-10-16 19:42:35 -07:00
d77bcd1691 Improve example for env vars in API docs
This was added in e41de3e6318ad4cb30eabab9bec60f9fb9d7a76b,
but can be a bit confusing due to the "outer" brackets
being for JSON, and the "inner" brackets to indicate
optional values.

During review of that change, this alternative
format was suggested.

Updating the example to use the format that was discussed
during review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 441c9411e369f5146783c46d7a9413917dacaebe
Component: engine
2016-10-16 19:22:42 -07:00
e3ae59fba6 Fixes #27095 : Removing registrytoken field from doc as it is deprecated by identitytoken field
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: 72dd684c88976b7c76cceeafe0ab6c98c8963b62
Component: engine
2016-10-15 08:38:33 +00:00
9fe833df60 Convert Markdown frontmatter to YAML
Some frontmatter such as the weights, menu stuff, etc is no longer used
'draft=true' becomes 'published: false'

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: b30609446d212624e3d4ce814c70130b75c552a0
Component: engine
2016-10-14 15:44:55 -07:00
c092dceac4 Merge pull request #27363 from tealtail/26227-add-stack-ps-to-docs
add documentation for `docker stack ps`, Fixes #26227 
Upstream-commit: e8e1c4dfb9a67c56b1001b39f1079a29f7ac8d5a
Component: engine
2016-10-14 10:02:26 -07:00
6e21c70cae Merge pull request #26795 from darrenstahlmsft/PauseResume
Implement Pause Resume support for Windows
Upstream-commit: dd383898cdcbcef7bd48bc0115cc9a739cf610f3
Component: engine
2016-10-13 18:08:11 -07:00
ce4d071742 add documentation for docker stack ps
also updates related stack docs and removes stack_tasks.md

Signed-off-by: Alicia Lauerman <allydevour@me.com>
Upstream-commit: 970ab9a224658e17894a7673189ad9d2491a592d
Component: engine
2016-10-13 15:09:58 -04:00
83dc9e6cea Implement Pause Resume support for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 69985e85d37af827fe2940a35d13e8b20a08fc8c
Component: engine
2016-10-11 16:23:35 -07:00
340a49b4b2 Update docs for Size and RefCount for UsageData
In 27294, `Size` and `RefCount` has been wrapped into `UsageData`
and is only exposed in `GET system/df`. Though the docs was not
updated in `docker_remote_api_v1.25.md`.

This fix updates the docs to refect the changes for `UsageData`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a68047fe688f59c390b2e8b210d57ff6857e833a
Component: engine
2016-10-11 15:41:00 -07:00
48cd323c6e Merge pull request #26894 from thaJeztah/improve-log-level-help
Improve --log-level help text
Upstream-commit: f65bf11e267b1788da12b5af5f41b44ce160cf69
Component: engine
2016-10-11 12:35:42 +02:00
01236b1c83 Improve --log-level help text
This information was added in
1efc940e6f547760e5e8f4648acb120ff19fdc58,
but removed again in
a271eaeba224652e3a12af0287afbae6f82a9333
to make the help-output fit in a 80-chars
terminal.

This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3197b312d03e6dc2c12a815bbc2632edfb03bb25
Component: engine
2016-10-10 23:10:17 +02:00
ec7885ffb8 Add support for ambient capabilities
Linux kernel 4.3 and later supports "ambient capabilities" which are the
only way to pass capabilities to containers running as a non root uid.

Previously there was no way to allow containers not running as root
capabilities in a useful way.

Fix #8460

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 199e19548e93262ab00873c1d761b0d05f866042
Component: engine
2016-10-10 19:29:02 +01:00
216da195bc Add the OPTIONS and Fix the links for contain prune
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6396c62fdc5355ff097da6a131cb176a5f521470
Component: engine
2016-10-11 00:13:33 +08:00
6453548dcb Fix the incorrect links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4b61b18ed2a137eaa27d76e0c57b7fe8f6600172
Component: engine
2016-10-10 23:26:05 +08:00