8fcdc8e325
API changes for service rollback and failure threshold
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 67bebd6d819ef46c78092441732fe2afde04fd5b
Component: engine
2016-10-18 10:09:30 -07:00
370f79baaa
Merge pull request #27435 from yuexiao-wang/fix-link
...
Fix a link for feature deprecation policy
Upstream-commit: 668189e7f007dcf276f94453504ee1d7a187ba7f
Component: engine
2016-10-18 10:04:42 -07:00
a74270e76f
Merge pull request #27472 from dnephin/move-graphdriver-quota
...
Move graphdriver quota
Upstream-commit: f5c21faf88f80778e98aa90ad328af19d27f289e
Component: engine
2016-10-18 09:09:09 -07:00
4a60903d29
Merge pull request #27463 from Microsoft/jjh/runservice
...
Windows: Mark run-service flag as hidden
Upstream-commit: 15ea28f6db7339f8a44078f3ef70484c96eebce7
Component: engine
2016-10-18 15:51:10 +02: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
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
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
b85187dbd0
Fix code block fences and typo.
...
Signed-off-by: Ding Fei <dingfei@stars.org.cn >
Upstream-commit: 08fe24c2d5ef415d2b94f8e3f28d0299db2d7b6a
Component: engine
2016-10-18 18:05:37 +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
26c4ac0d99
Fix link for feature deprecation policy
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b7d34e1c03849a24a4c9c561391a577d4539368c
Component: engine
2016-10-18 17:56:58 +08:00
f3b85d76fb
Merge pull request #27471 from caarlos0/logentries
...
Added Logentries Driver
Upstream-commit: 24582e815330edd197337f17b1a0a541679f969b
Component: engine
2016-10-18 01:33:28 -07: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
2cd33b295f
Make golint happy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: eb4c4b7ecfb06e304139dcffe9ef309c57479211
Component: engine
2016-10-17 17:28:27 -07:00
5d899f98e2
move graphdriver/projectquota.go to its own package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 767727480f2856440cc908be7c9296dccb93346c
Component: engine
2016-10-17 17:27:24 -07:00
23d87cfd7e
Added logentries dependency to vendor
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com >
Upstream-commit: 0f4db1cc59faddb0207db269fd660e8e1582b77a
Component: engine
2016-10-17 22:06:39 -02:00
7906a55d05
Merge pull request #27459 from aquasecurity/xfs_quota_fedora_build_fix
...
projectquota: fix build failure with new kernels
Upstream-commit: cd0e399e062b45bb0c5e11c7eb4de933b1ad0564
Component: engine
2016-10-18 00:13:27 +02:00
fb34a38625
Merge pull request #26519 from AkihiroSuda/fix-cli-command-formatter-json-support
...
Fix broken JSON support in cli/command/formatter
Upstream-commit: c028a88158f0f993bc7789883be1208e94a1a6b7
Component: engine
2016-10-17 22:44:04 +01: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
b2c482a30a
Merge pull request #27457 from vdemeester/use-volume-name
...
Revert docker volume column name to VOLUME_NAME
Upstream-commit: 81ce55bb877f004042960705d36636ee3c6f03bd
Component: engine
2016-10-17 13:00:50 -07:00
15c4940651
Update docker stop and docker restart to allow not specifying timeout and use the one specified at container creation time.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: cc703784f39fb3f585ec685cf7aeda6410648446
Component: engine
2016-10-17 12:53:35 -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
d1476e7d2c
Windows: Mark run-service flag as hidden
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 102a38ceb13478351e32c9c40e31e5b3f3298e76
Component: engine
2016-10-17 12:21:31 -07:00
c6750abd82
projectquota: fix build failure with new kernels
...
In kernel version >= v4.5 the project quota ioctl definitions
have been made public via the include/uapi/linux/fs.h API, so
that ext4 could use the same API.
Avoid re-defining the ioctl API if it is already defined in fs.h.
Signed-off-by: Amir Goldstein <amir73il@aquasec.com >
Upstream-commit: 9ea50714469c0c5773178222ae6b745701ac9076
Component: engine
2016-10-17 21:44:23 +03: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
e12b8f5ae9
Revert docker volume column name to VOLUME_NAME
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 862db3f191b9f1e2426b10d433270bd414ba5a48
Component: engine
2016-10-17 20:03:31 +02: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
cc3045cf2d
Merge pull request #27421 from jcberthon/master
...
builder: Add AppArmor to runc buildtags for armhf - fixes #27351
Upstream-commit: fb65df5bfe7c03a449b4d7c2c57d73de590ea2e1
Component: engine
2016-10-17 19:20:09 +02:00
a43b38269a
Merge pull request #27424 from pcgeek86/patch-1
...
Update ISSUE_TEMPLATE.md
Upstream-commit: d5a4b0e839b36f216db09a9c43e5a52c8430828e
Component: engine
2016-10-17 10:15:10 -07:00
d9f401546d
Merge pull request #25566 from allencloud/fix-config-load-bug
...
fix config load error with default ulimits
Upstream-commit: 165a3d0a7530b20167b99dace601a00a46a99dfa
Component: engine
2016-10-17 18:58:12 +02: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
ea42139e74
Merge pull request #27432 from thaJeztah/deprecate-fedora-22
...
Remove Fedora 22 from RPM build as it is EOL
Upstream-commit: e5d293375d6f9e4213ba7df68036b1ab082040f1
Component: engine
2016-10-17 17:14:10 +02:00
bddbeade83
Merge pull request #27392 from Microsoft/jjh/securitydescriptor
...
Windows: Set administrators ACL on debug listener
Upstream-commit: e40c512f60c971da4912ba3740e209c4b40b690d
Component: engine
2016-10-17 17:13:38 +02:00
2a36eb47f4
Merge pull request #27367 from Microsoft/jjh/fieldsincontainer
...
Windows: Factor out unused fields in container
Upstream-commit: b0f3d7a1b5e52a446f52beaecbc30102e1b954d8
Component: engine
2016-10-17 16:50:39 +02:00
5e0a03849e
Merge pull request #27074 from cyli/bump-notary-version
...
Bump notary version to 0.4.2
Upstream-commit: a7c883fb04412174dfa2c31d030c643e0c20ca1d
Component: engine
2016-10-17 16:35:57 +02:00
9e4e0de259
Update ISSUE_TEMPLATE.md
...
Added general support information to the issue template.
Signed-off-by: Trevor Sullivan <trevor.sullivan@clusterhq.com >
Upstream-commit: ff3f3d7941edee7d5a3b6b13f6c0ef6f2d58bc8b
Component: engine
2016-10-17 11:43:25 +00:00
ac1a893741
fix config load error with ulimits
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: e3164842f34a55048af709ee827566e4950aa508
Component: engine
2016-10-17 18:48:40 +08:00
a08dc5dfdf
Merge pull request #27419 from yongtang/10162016-warning
...
Fix an incorrect `WARNING` output in `docker run/create`
Upstream-commit: 55cd8f53c9bc2e1d53ff3761c1109309fee6f4f7
Component: engine
2016-10-17 18:37:03 +08: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
6d715e3038
Fix broken JSON support in cli/command/formatter
...
How to test:
$ docker ps --format '{{json .}}'
$ docker network ls --format '{{json .}}'
$ docker volume ls --format '{{json .}}'
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 3a32b587922eca87d1ab23689f407b75a8603ccb
Component: engine
2016-10-17 08:07:17 +00: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
91be57517e
Fix an incorrect WARNING output in docker run/create
...
This fix tries to fix an incorrect `WARNING` output in `docker run/create`:
```
ubuntu@ubuntu:~/docker$ docker run -d --cpu-percent 80 busybox top
WARNING: %s does not support CPU percent. Percent discarded.
WARNING: linux
e963d1108e455e7f8f57626ca1305b5f1999e46025d2865b9a21fc8abc51a546
```
The reason was that in `daemon/daemon_unix.go`, the warning string
was not combined with `fmt.Sprintf` before appended to the output.
This fix fixes this issue.
This fix has been manually tested and verified:
```
ubuntu@ubuntu:~/docker$ docker run -d --cpu-percent 80 busybox top
WARNING: linux does not support CPU percent. Percent discarded.
fcf53f79d389235bae846d3d40804834659ac025edbc0d075ed91841a8e4c740
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 40f25809abacc99953385dbe6b107218d8b5522f
Component: engine
2016-10-16 17:11:39 -07:00
246994fa74
Merge pull request #27416 from AkihiroSuda/fix-failing-TestBuildLabelsOverride
...
[test] fix failure of TestBuildLabelsOverride on Windows
Upstream-commit: 319a929c371525b7521d08dcc13fb34317a76ff4
Component: engine
2016-10-16 15:14:57 -07:00
