Phil Estes
27cea9b936
Merge pull request #21191 from tophj-ibm/ppc64le-update-dockerfile
...
ppc64le: update dockerfile hashes and notary
Upstream-commit: 69f297bfeef33145c4c23b5e555f39aa443cd60f
Component: engine
2016-03-15 09:17:45 -07:00
Phil Estes
6b75bb519f
Merge pull request #20177 from jheiss/12076-net_hostname
...
Allow --hostname with --net=host
Upstream-commit: 21e531014db65422e1a3000fd3596459f55870c4
Component: engine
2016-03-15 08:17:25 -07:00
Sebastiaan van Stijn
2f4ce11dc1
Merge pull request #21196 from LK4D4/detect_leaks_util
...
integration-cli: move goroutines info helpers to separate funcs
Upstream-commit: daabb45d0ac6c332ef0b54c30f70dfa2b459d362
Component: engine
2016-03-15 12:42:47 +01:00
Vincent Demeester
a9e5db306d
Merge pull request #21205 from geekylucas/21195-update-docs-debian-image-size
...
Update docs: A more accurate size for debian image
Upstream-commit: 43b5e1ed40ded2d59f8505df254d2f95fbdf8132
Component: engine
2016-03-15 11:18:27 +01:00
Sebastiaan van Stijn
45ead964ff
Merge pull request #21190 from runcom/cleanup
...
*: remove unused stuff
Upstream-commit: 68ca76320fe1ca56d6b9dfed6ca84741f957a495
Component: engine
2016-03-15 11:13:10 +01:00
Vincent Demeester
fd384bf5db
Merge pull request #21209 from HackToday/fixdocps
...
Add the missed volume filter
Upstream-commit: f9fe796eabd015cbf861df2550a8bffd861a5b25
Component: engine
2016-03-15 10:59:52 +01:00
Kai Qiang Wu(Kennan)
bff930c257
Add the missed volume filter
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: b1619766c0131a02774c7ec2b158c2fdf7206d05
Component: engine
2016-03-15 09:26:41 +00:00
Lucas Chan
2093c7b7f9
Update docs: A more accurate size for debian image
...
Fixes : #21195
The current size of the debian image is 125.1 MB so I have updated the Markdown to say "under 150". Also removed "extremely" (minimal) as requested. Documentation built and tested using `make docs`.
Signed-off-by: Lucas Chan <lucas-github@lucaschan.com >
Upstream-commit: 2f634e4691d13616cf8c714ec7653616ec3b121a
Component: engine
2016-03-15 18:29:06 +11:00
Brian Goff
fa85755ee7
Merge pull request #21097 from thaJeztah/dont-run-without-udev-sync
...
Fail when devicemapper doesn't support udev-sync
Upstream-commit: 37a1fadae6390e38da85d3fffe7a49e00de2830e
Component: engine
2016-03-14 21:18:01 -04:00
Vincent Batts
30dcca7468
Merge pull request #20786 from rhvgoyal/min-free-space
...
devmapper: Add a new option dm.min_free_space_percent
Upstream-commit: bfed97b6881393be51e81b97040f3874b61b8d72
Component: engine
2016-03-14 20:10:43 -04:00
Brian Goff
971cc9c13a
Merge pull request #20121 from solganik/master
...
syslog format
Upstream-commit: f5009515989f6e16d3e9955a7905d1fe64e73642
Component: engine
2016-03-14 20:09:15 -04:00
Alexander Morozov
1f830d0241
integration-cli: move goroutines info helpers to separate funcs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0c7c9df8048353f3ff84d88d4311196546ba56cf
Component: engine
2016-03-14 15:52:56 -07:00
David Calavera
32e01227d0
Merge pull request #20111 from twistlock/19995_skip_user_ns
...
Run privileged containers when userns are specified - feature proposal
Upstream-commit: d8539347bfb9c019a29b56ea36f1538900bc543b
Component: engine
2016-03-14 15:11:55 -07:00
Brian Goff
b59f91dbea
Merge pull request #21151 from mountkin/optimize-test
...
optimize slow tests
Upstream-commit: 01f165169b6913320defdc9ce3995614e4c286d1
Component: engine
2016-03-14 16:39:01 -04:00
Sebastiaan van Stijn
3d9cc0b835
Merge pull request #21192 from ohadschn/master
...
Fix Remote API doc double slash typo in cURL command
Upstream-commit: fa8417d9efbb765904c018f484f0f0985a6955d8
Component: engine
2016-03-14 21:34:48 +01:00
Vincent Demeester
3e1d30a506
Merge pull request #20949 from imjching/master
...
Fix typo for download and upload retry messages
Upstream-commit: 90ce409e3581b455ab8ac6532684ef3e9475772a
Component: engine
2016-03-14 21:08:49 +01:00
Ohad Schneider
b29707bc59
Fix Remote API doc typo in cURL command
...
Either a single slash or localhost should be specified after http in the cURL URL, not http:// (double slash)
Signed-off-by: ohadschn <ohad188@gmail.com >
Upstream-commit: e31217fbc46e2dc99fa281332f9465562b26f073
Component: engine
2016-03-14 21:15:38 +02:00
David Calavera
cb0a6e9bbb
Merge pull request #21149 from yongtang/21124-TestJSONFormatProgress
...
Fix flaky test TestJSONFormatProgress (#21124 )
Upstream-commit: c5aedcdac9c30e764c22d1be1dd2c08c52c74fcc
Component: engine
2016-03-14 11:50:50 -07:00
Christopher Jones
36b081e8df
ppc64le: update dockerfile hashes and notary
...
Now that we are using gc/go 1.6, update a few hashes as well
as actually building the notary binary
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 2bcf50bdd41174b2519cab66b1fef0eb8bc78f9b
Component: engine
2016-03-14 14:36:20 -04:00
Antonio Murdaca
4e53d3095a
*: remove unused stuff
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 59648fc1e9d99cae7f4c5f692fe25a73d0651a71
Component: engine
2016-03-14 18:41:30 +01:00
moxiegirl
ed5dba754a
Merge pull request #21158 from thaJeztah/add-alias-for-removed-docs
...
Add redirects for old Docker Cloud tutorial
Upstream-commit: 7ae199052678c08cceec069a6014edfc4034c0f8
Component: engine
2016-03-14 10:24:12 -07:00
David Calavera
9694bed63e
Merge pull request #21002 from tonistiigi/fix-id-noprefix
...
Fix docker run for 64 byte hex ID
Upstream-commit: df20b5cfd337bb3093fd87e278501fbca4480d54
Component: engine
2016-03-14 10:17:38 -07:00
David Calavera
1ddccf6e06
Merge pull request #21048 from LK4D4/fix_attach_leak
...
daemon: fix hanging attaches on initial start failures
Upstream-commit: 8e74cf59d06ce0052193ec8216db5dca7eec4981
Component: engine
2016-03-14 10:16:45 -07:00
Brian Goff
9da8efbb67
Merge pull request #21161 from Microsoft/jjh/TestLogsPerformanceProblem
...
Windows: Improve TestLogsContainers performance
Upstream-commit: 3d42393e7f4434a03002cf6649af79e5405cae07
Component: engine
2016-03-14 13:04:16 -04:00
Jay
6157c6cb94
Fix typo for download and upload retry messages
...
Signed-off-by: Jay <jay@imjching.com >
Upstream-commit: f8d14bd4c6a0e3c58130be159b05b8aa63374f6e
Component: engine
2016-03-15 00:56:19 +08:00
Aaron Lehmann
2f7e1dc6a8
Merge pull request #21159 from runcom/fix-retry-push-bug
...
distribution: errors: do not retry if no credentials provided
Upstream-commit: 0b962f72a97c5e1cde020cc948704e61ab8dfc0a
Component: engine
2016-03-14 09:47:13 -07:00
David Calavera
937fbaecf3
Merge pull request #21131 from estesp/gcc-devmapper-test-broken
...
Fix gcc compile test with proper flag ordering
Upstream-commit: 3771a1713bac935721ffe2ed7c828a47dbe4924e
Component: engine
2016-03-14 09:46:49 -07:00
David Calavera
cd7673772c
Merge pull request #21123 from justincormack/libseccomp23
...
Update statically linked libseccomp to 2.3.0
Upstream-commit: d95723f5efbda12c854491250b06931b47145228
Component: engine
2016-03-14 09:45:29 -07:00
Yong Tang
fab87296b0
Fix flaky test TestJSONFormatProgress ( #21124 )
...
In TestJSONFormatProgress, the progress string was used for comparison.
However, the progress string (progress.String()) uses time.Now().UTC()
to generate the timeLeftBox which is not a fixed value and cannot be
compared reliably.
This PR fixes the issue by stripping the timeLeftBox field before doing
the comparison.
This PR fixes #21124 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d17bb23ae6efba6e76e7a56b856705400e26a61b
Component: engine
2016-03-14 16:00:12 +00:00
Liron Levin
e578be78a3
Run privileged containers when userns are specified
...
Following #19995 and #17409 this PR enables skipping userns re-mapping
when creating a container (or when executing a command). Thus, enabling
privileged containers running side by side with userns remapped
containers.
The feature is enabled by specifying ```--userns:host```, which will not
remapped the user if userns are applied. If this flag is not specified,
the existing behavior (which blocks specific privileged operation)
remains.
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 6993e891d10c760d22e0ea3d455f13858cd0de46
Component: engine
2016-03-14 17:09:25 +02:00
Vincent Demeester
83045d547d
Merge pull request #20970 from dmcgowan/login-oauth
...
OAuth support for registries
Upstream-commit: b9361f02da25108af75238093959634e433d72a0
Component: engine
2016-03-14 15:49:44 +01:00
Sebastiaan van Stijn
38c767cc35
Merge pull request #20990 from sds/fix-data-volume-rest-api-docs
...
Fix documentation for creating containers with data volumes
Upstream-commit: f480c696251906d86c800b5cf3660c48335e361c
Component: engine
2016-03-14 15:06:40 +01:00
Brian Goff
9fbfb6e6c5
Merge pull request #21134 from tophj-ibm/fix-logtest-on-empty-log
...
Fix error-checking when looking at empty log
Upstream-commit: 93e04e705a3cdd639b90aef18ca98eb5db9518d3
Component: engine
2016-03-14 10:00:57 -04:00
Sebastiaan van Stijn
7c5d8d17ae
Merge pull request #21138 from tophj-ibm/add-notary-binary-test-requirement
...
Add notary binary requirement for tests
Upstream-commit: 30999ba50c8b1258de8cc6b5f05452114a87590e
Component: engine
2016-03-14 13:34:06 +01:00
Antonio Murdaca
cad593b9ac
integration-cli: add tests for case a) and d) in #21054
...
- add test for pull from private registry with no credentials
- add test for push to docker hub with no credentials
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Signed-off-by: Antonio Murdaca <amurdaca@localhost.localdomain >
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 6d23c3c57a733436d902b7883f2f0b00846df9e2
Component: engine
2016-03-14 12:43:10 +01:00
Vincent Demeester
10aa342590
Merge pull request #21160 from mavenugo/staleep
...
Include all endpoints in network inspect object
Upstream-commit: 901c67a8eeabc64e53539b5f3d5aac9c9196a037
Component: engine
2016-03-14 11:36:04 +01:00
Lei Jitang
5399e21cfc
Merge pull request #21177 from HackToday/fixtypo
...
Fix the typo url and info
Upstream-commit: d4a4cb99e3a447d7711140ff377a3ece0e6bc1a2
Component: engine
2016-03-14 16:09:20 +08:00
Kai Qiang Wu(Kennan)
5963d3bf40
Fix the typo url and info
...
Some info is not consistent between context and word.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: f6bd62a8d735d4748dc4e5e4235e04284a7f5af6
Component: engine
2016-03-14 06:34:08 +00:00
Sebastiaan van Stijn
b92020dc4b
Merge pull request #21120 from lirantal/feature/21119-docker-config-for-windows
...
closes #21119 updating documentation for Windows and OSx users
Upstream-commit: f3485bc125afbb0930674e9f5a4f02cdd9989aea
Component: engine
2016-03-14 01:38:26 +01:00
Madhu Venugopal
f960c0a25f
Include all endpoints in network inspect object
...
Prior to this change, the "docker network inspect" contains only the
endpoints that have active local container. This excludes all the remote
and stale endpoints. By including all the endpoints, it makes debugging
much simpler and also allows the user to cleanup any stale endpoints
using "docker network disconnect -f {network} {endpoint-name}".
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2ef00ba89fc04b0a7571aa050d8a11c06f758d9b
Component: engine
2016-03-13 16:58:53 -07:00
Alexander Morozov
3d62a1d04d
Merge pull request #21122 from mavenugo/mviv
...
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
Upstream-commit: 2d74f78ab59c4e24c5f328f3d85671359b8ed828
Component: engine
2016-03-13 11:32:58 -07:00
Liran Tal
60406a0aa6
closes #21119 - updating documentation for Windows and OSx users
...
Updating Docker's documentation file docker configuration file on Windows hosts.
This is of importance for Windows users whom are utilizing the Docker Toolbox.
Signed-off-by: Liran Tal <liran.talh@gmail.com >
Upstream-commit: d2aa521822135009168fe5a13d372fbc6969dc91
Component: engine
2016-03-13 17:55:34 +02:00
Brian Goff
05bbd93137
Merge pull request #20977 from allencloud/fix-delete-response-status-code
...
return status code http.StatusNoContent in deleting network when OK
Upstream-commit: a04e16ac35e8dd9ec10462cccebf13cf29b49a51
Component: engine
2016-03-13 11:30:32 -04:00
John Howard
af1688f8ea
Fix TestLogsContainers performance
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8ff884548f9dfcc67a1a3bc186957c964fb62fe4
Component: engine
2016-03-12 16:15:14 -08:00
Vincent Demeester
890088fca6
Merge pull request #21155 from mountkin/broken-links
...
docs: fix broken links
Upstream-commit: ed6fb41321dac41f5a8975be2ca3c64fa78e28f1
Component: engine
2016-03-12 23:53:24 +01:00
Antonio Murdaca
2909d7c372
distribution: errors: do not retry if no credentials provided
...
Fix and add test for case c) in #21054
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 497d545093bce4f01455bf8d2e1658435dbb040b
Component: engine
2016-03-12 20:41:47 +01:00
Jess Frazelle
1a1627292d
Merge pull request #21150 from cyphar/fix-pids-stats
...
client: stats: fill in stats info on client
Upstream-commit: 4e7df42aa872a0244e5d4bbc5b8876046f922c7d
Component: engine
2016-03-12 11:25:15 -08:00
Sebastiaan van Stijn
e6538b9ff7
Merge pull request #21154 from runcom/fix-typos-1
...
docs: add $ before HOME
Upstream-commit: c46ab3d593bdce9fda37f9a042a2c52bd446a289
Component: engine
2016-03-12 15:15:48 +01:00
Shijiang Wei
3bff8135d8
docs: fix broken links
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 36506b7944cf9cea9b3618f00ecfc68a41f86dd8
Component: engine
2016-03-12 21:24:55 +08:00
Antonio Murdaca
96dba4b028
docs: add $ before HOME
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 219e5fdda36a18104f7593da9ed8ca097a60aab3
Component: engine
2016-03-12 14:11:01 +01:00