Commit Graph

26198 Commits

Author SHA1 Message Date
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
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
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
5c9492231e Merge pull request #27236 from allencloud/return-nil-when-no-node-or-service
return nil when no node or service to avoid additional api call
Upstream-commit: 9f5ffa2a81c7490eca44a473f77cad03a1267808
Component: engine
2016-10-16 18:41:31 +02:00
647cbda777 builder: Add AppArmor to runc buildtags for armhf
On Raspbian and Debian Jessie for ARMv7 (aka armhf), the builtags for runc
were missing. These buildtags should include 'apparmor' and 'selinux'.

Signed-off-by: Jean-Christophe Berthon <huygens@berthon.eu>
Upstream-commit: e0c7300e3b2abea3d32d591fb01ee798ff59e0d4
Component: engine
2016-10-16 15:32:31 +00:00
2fac2c1b97 [test] fix failure of TestBuildLabelsOverride on Windows
TestBuildLabelsOverride was consistently failing due to "Windows does not support FROM scratch" error

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: bb17d1fabbd75d76edb8bf26e006ff0238ba8c00
Component: engine
2016-10-16 11:05:31 +00: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
086cdbe518 Merge pull request #27174 from duglin/Issue26027
Don't env-var evaluate labels from docker build cmd line
Upstream-commit: 6f54d70a54d8d711e2b9d1e2578d45682e7130b8
Component: engine
2016-10-14 20:57:41 -07:00
da28368db8 Merge pull request #26928 from thaJeztah/update-release-checklist
Add updating AUTHORS to the release checklist
Upstream-commit: 9b2970283b4ea26016e6746831a0fbbeb790772e
Component: engine
2016-10-14 18:33:26 -07:00
c6ab589035 Merge pull request #27322 from yongtang/25855-deploy-dab-extension
Allow `docker deploy` command accept stack with/without extension
Upstream-commit: 4a6b37eb3ef3cb9751a9fe114b4628c8696b2c6a
Component: engine
2016-10-14 18:26:49 -07:00
f2c48492e1 Merge pull request #27368 from morelena/move_close
integration-cli: move Close() after error check
Upstream-commit: 12212943862b46fa4d4d3ed4fbece31f70e300c8
Component: engine
2016-10-14 18:25:36 -07:00
3962433600 Fix API incompatibilities between notary v0.3.0 and v0.4.2:
- some function signatures have changed - use the new ones
- re-generate the notary delegation key certs, since notary doesn't allow SHA1
- fix some error message mapping because now if a root rotation fails to validate trusted operations will fail

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 0797af39c2abb681a0e291651686872539a9e187
Component: engine
2016-10-14 17:53:34 -07:00
58bc04a76a Bump vendored and dockerfile notary version to v0.4.2
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5f4dcd825299bf58e87e69c2bff3ceefc300a432
Component: engine
2016-10-14 17:52:56 -07:00
c040e3fa40 Merge pull request #27334 from darrenstahlmsft/ExpandSandboxSizeZero
Windows: Stop expanding sandbox size when no new size is specified
Upstream-commit: f2c094cb99b20faba0731509ca9ebb4c5e67e9cf
Component: engine
2016-10-14 17:51:32 -07:00
af33dfda24 Restore Docker logo in README.md
Signed-off-by: Ryan Zhang <ryan.zhang@docker.com>
Upstream-commit: 59357bab8c745e873a5c86caed1e2bb2052337a2
Component: engine
2016-10-14 16:12:27 -07:00
12942de674 Merge pull request #27401 from mstanleyjones/toml_to_yaml
Convert Markdown frontmatter to YAML
Upstream-commit: 07aa2629e399262e5410c55c1e2276776fd6e3f6
Component: engine
2016-10-14 15:46:21 -07: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
4f9853e826 Merge pull request #27395 from mrjana/net
Vendoring libnetwork @04025f2a2eebb
Upstream-commit: 678ff27f0fd108b1760b3b0b4939d62b7d5eb6be
Component: engine
2016-10-14 14:54:47 -07:00
da2b0bc963 Merge pull request #27385 from jphuynh/update-jessfraz-github-handle
Fix incomplete change from PR #27347 (jessfraz github handle update.)
Upstream-commit: d0a17e4813bcd8663d5168e46292f9f5698f97a6
Component: engine
2016-10-14 14:24:20 -07:00
9bbfdc44cc Merge pull request #27332 from mstanleyjones/27297
Remove contents of docs/ except for reference, point to new location
Upstream-commit: fba04ed0ab783409badad6e673eacb509682a96b
Component: engine
2016-10-14 14:12:09 -07:00
24ba04043a Add a link to the new build instructions
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 3aeaa9f8fdb835e44edae04d7b43b85e66fcb4c3
Component: engine
2016-10-14 14:05:48 -07:00
6f9659dfb5 Allow docker deploy command accept filename with/without extension
This fix tries to address the issue raised in 25855 where the command
`docker deploy` can only accept a STACK without extension of `.dab`.
In other words, `docker deploy hellojavaee.dab` gives an error:
```
Bundle hellojavaee.dab.dab not found. Specify the path with --file
```

This fix updates the way namespace STACK is taken so that in case
`STACK.dab` is provided with `docker deploy`:
```
$ docker deploy STACK.dab
```
The `STACK` is used as namespace (instead of `STACK.dab`).

NOTE: This fix will only allows `.dab` extension in namespace, because
it is not possible to have a namespace with `.` in the middle. In other
words, a namespace `hello.java.ee` will not work anyway (whether the file
`hello.java.ee` exists or not).

An additional integration test has been added to cover the changes.

This fix fixes 25855.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1e9d04c458e90f38c970c7937830504d2e919066
Component: engine
2016-10-14 11:44:15 -07:00
f54a7d0f94 Vendoring libnetwork @04025f2a2eebb
Fixes #27323

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9ae9f9812bc078523d64625793c079d99215cb63
Component: engine
2016-10-14 11:12:24 -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
dfcee0ffa0 Windows: Set ACL on debug listener
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 192e6d9995f93b2876833ad5d49eb18c1b984395
Component: engine
2016-10-14 09:15:17 -07:00
bab8c78bf2 Fix incomplete change from PR #27347 (jessfraz github handle update.)
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 666ac08fab62dd407c5d87d197ea7ecc9ff4e767
Component: engine
2016-10-14 14:37:02 +01:00
a5bfdba8fe Merge pull request #27333 from yongtang/27049-ListOpt
Use ListOpt for `docker network create --label` and `docker volume create --label`
Upstream-commit: 66177532b6aad9f127c89f21176c9dc28d0ba8d8
Component: engine
2016-10-14 00:31:09 -07:00
86c7d2f369 Merge pull request #27027 from tonistiigi/fix-name-collision
Fix name collision handling in restore
Upstream-commit: 9ced849832dc7a5f15f7fda6d2f3bdb38bbf5483
Component: engine
2016-10-14 08:59:56 +02:00
1e912551c1 Merge pull request #27335 from barracks510/master
Simplify function signature
Upstream-commit: 429812f86a7095c19ae48552f6b97150846ca29b
Component: engine
2016-10-13 18:54:01 -07:00
e063aa0187 Merge pull request #27366 from morelena/use_contains
all: use strings.Contains instead Index
Upstream-commit: 21a79b503a5c1331d0c000d26179a55fc235b021
Component: engine
2016-10-13 18:44:30 -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
128dd03e48 Merge pull request #26819 from ripcurld00d/fix_stats_mutex
Hide the mutex lock in formatter.ContainerStats
Upstream-commit: ba2c13fcf55a69a67a861be6fa39a7def803f631
Component: engine
2016-10-13 17:38:22 -07:00