d1d856514e
Fix "./docker" package name on freebsd
...
This fixes "can't load package: package ./docker: found packages client.go (main) and daemon_freebsd.go (docker)"
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: e54c4517a78ea87e6611784f9900e82f60a23303
Component: engine
2015-11-17 09:38:19 -08:00
20dbe8b748
Remove redundent lines
...
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org >
Upstream-commit: 741246d69f7708941ee86a706c6e93d20275904f
Component: engine
2015-11-17 18:24:17 +01:00
820dd65e7d
Merge pull request #17999 from tianon/linkmode-external
...
Remove "-linkmode external"
Upstream-commit: 71f422435ed0ea645355f1375e2a778822416302
Component: engine
2015-11-17 08:33:32 -08:00
2ed2d47ded
Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
...
Add initial support for Docker on ARM
Upstream-commit: 1c8d8b301259ae18cfdb56043c000e8353987a3a
Component: engine
2015-11-17 16:52:54 +01:00
98dbfb535e
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
Upstream-commit: d507acb17564986af17f653d8fa1b774993451b4
Component: engine
2015-11-17 16:40:06 +01:00
89639c244b
"Assert change"
...
Signed-off-by: GoBella <caili_welcome@163.com >
Upstream-commit: c16dd88c5ef35ee5fc508d1f4cef0aacd3ed58a1
Component: engine
2015-11-17 18:40:18 +08:00
e6a1f28a7f
Merge pull request #17556 from donhcd/testForStatsVersioning
...
Test for stats versioning
Upstream-commit: af9757576c69159078a1ed8e1d61049a173eafa1
Component: engine
2015-11-17 11:19:34 +01:00
567557144f
Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
...
Windows: Fix docker exec
Upstream-commit: 6f1bc096a64efb592b56dbdefc5bfce1fa7935d3
Component: engine
2015-11-17 11:14:54 +01:00
844d964e9e
Fix Markdown syntax error in aufs-driver
...
Signed-off-by: dm4 <dm4@skymizer.com >
Upstream-commit: ea047640597929436f13099fb3dc1e52f98f685b
Component: engine
2015-11-17 17:38:36 +08:00
f8169b65c3
Make NormalizeLocalName to not reach the network to normalize names.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b665730d2c76cf991c123ad3387d6ba736a7515a
Component: engine
2015-11-17 03:31:32 -05:00
b68e94a11d
Fix typo when --expose and --net are specified.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
Upstream-commit: a25988cf760b96c855b3e1442547ea9d763c7cd1
Component: engine
2015-11-16 22:01:20 -08:00
a7857ff3b0
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 81aa1b507f51901eafcfaad70a656da376cf937d
Component: engine
2015-11-16 17:10:53 -08:00
d87c897f93
Merge pull request #17988 from Microsoft/jjh/pushv2
...
Windows [TP4] Fix push to not kill daemon
Upstream-commit: ef424c108a90a04e9c5b0bd48b9047054a6a798b
Component: engine
2015-11-17 01:28:34 +01:00
eb219a3ce5
Use /usr/lib/os-release if /etc/os-release is missing.
...
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.
http://www.freedesktop.org/software/systemd/man/os-release.html
Thanks James Hunt <james.o.hunt@intel.com > and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com > for contribution.
Close #17174
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 292a15e40a7201801fb9b0abd81175fd0a09a814
Component: engine
2015-11-16 16:21:31 -08:00
0cbb4862c1
change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example
...
Signed-off-by: Victor I. Wood <viw@t2am.com >
Upstream-commit: ac526193afca9cb529d6c61f88bbdde11e2382aa
Component: engine
2015-11-16 12:41:06 -08:00
c14625645c
graph/graph.go: simplify appending to slice in map in byParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 25b37e2f0481e5e71e0c9c89827823affd50dd77
Component: engine
2015-11-16 12:02:35 -08:00
05e1d2c256
Typo in previous PR processConfig, not c.ProcessConfig
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d7692b02bdeafc2837bf4269527c2eaa8be254b1
Component: engine
2015-11-16 11:56:01 -08:00
cbf9321ca8
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
a86a41003e
Merge pull request #17515 from azurezk/fixdoc
...
fix doc of volume name conflict
Upstream-commit: 4b706195d2e5b551ce08620862fdc4a8f8c8489f
Component: engine
2015-11-16 09:15:50 -08:00
48f3b95e87
Merge pull request #18016 from moxiegirl/carry-17453
...
docs: modifying volumes guide to remove ambiguity. Signed-off-by: And…
Upstream-commit: e88ffba2ecc01f1185523013b54479dfc58f971a
Component: engine
2015-11-16 17:35:04 +01:00
7c619e8f4a
Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
...
fix the bug: cpu percent will extremely high
Upstream-commit: 7c5cdda74eaf27a31ec1a7b6e4d79ff0f0bbae4d
Component: engine
2015-11-16 17:26:29 +01:00
e0d2996208
docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com>
...
Adjusted as per comment.
Rebase and squash by moxigirl
Signed-off-by: Andre Granovsky <robotciti@live.com >
Upstream-commit: be2152116cd719b65d4b58c3b8fb7f63d7655f4b
Component: engine
2015-11-16 08:24:26 -08:00
a3d77b0213
Update ubuntulinux.md
...
Remove '*' for purge
Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com >
Upstream-commit: fe123edb080a2e60ce4d34fb0cf72d06c80cba79
Component: engine
2015-11-16 13:29:36 +01:00
8bae47da35
Merge pull request #17985 from Microsoft/jjh/firstboot
...
Windows: [TP4] Fix regression on second or later container starts
Upstream-commit: 92487d7fb4963c0333c409d053ff694e619c538d
Component: engine
2015-11-16 10:03:46 +01:00
3e26fccb77
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
Upstream-commit: aa7fd884e609d3d13df628600a1799e0e76444e9
Component: engine
2015-11-16 15:28:09 +09:00
5b2890f6ff
Windows: Disable links
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b2771b4456f12c0f55ee0f1e70d620fe1a77ca4f
Component: engine
2015-11-15 21:32:31 -08:00
19bcd2fd89
Remove "-linkmode external"
...
We're having to override it in so many places that it no longer seems worthwhile to bother. On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 927e1e98b7d37bf0593651d4b639e19277e775ca
Component: engine
2015-11-15 14:47:48 -08:00
02d6078f37
bash completion for docker {run,create} --volume-driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d411c47139e9a6d94c54bfb4052e7d12bf4295f0
Component: engine
2015-11-15 09:53:22 -08:00
3b6e098493
Windows [TP4] Fix push to not kill daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7e5e29e415f20eeb75f548ec9c5a2b5c38403600
Component: engine
2015-11-15 08:43:23 -08:00
35adb0ee96
fix doc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 82ba25bea9ae8412186e4cd1d3ba30e6a2072a26
Component: engine
2015-11-15 23:32:40 +08:00
4c0e9a7066
Add initial support for Docker on ARM
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: b74fd0628aefbca3b77ffa5d52995c7af2f38d04
Component: engine
2015-11-15 13:15:31 +01:00
44e369485f
Merge pull request #17945 from tonistiigi/fix-windows-pull
...
Fix docker pull on windows
Upstream-commit: 59fe485f0d33bbcc7b35b5c3ec650cf53a16339d
Component: engine
2015-11-15 12:32:25 +01:00
2e538bcbf1
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7929888214741c4ab194c44e0b14ac08aca06556
Component: engine
2015-11-15 10:40:01 +01:00
58a0ba7cc6
Fix invalid proxy setting example
...
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com >
Upstream-commit: d9ef4f2986b93b64289d858c55b3bee67804c444
Component: engine
2015-11-15 17:11:27 +09:00
c9ee279a92
Merge pull request #17479 from coolljt0725/show_warning
...
Show warning when user specify dm.basesize for already initialized devicemapper driver
Upstream-commit: cf824d974922ae7ad55548b3f0050a2bb0e29aa2
Component: engine
2015-11-15 08:51:33 +01:00
7756f05e05
Merge pull request #17987 from jfrazelle/correct-ltdl
...
Correct ltdl and fix experimental macro for rpms
Upstream-commit: 586152523d3c10624156eee485d54de80eeb7fc7
Component: engine
2015-11-15 03:46:23 +01:00
c0f1567bbc
Extract rotate file writer from json log driver
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: 086c0b4a6616e8db8009a5d72411bcc6774adaf1
Component: engine
2015-11-14 16:15:44 -07:00
2052e6ad6a
Fix small typos in documentation files
...
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com >
Upstream-commit: d1e72baa15fb81a6dcf80e6727b884fc8ff67335
Component: engine
2015-11-15 00:53:27 +02:00
b843dca39f
fix experimental boolean macro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 38724c80ab32d5d578029f19a1b443341ff3aaf4
Component: engine
2015-11-14 14:47:13 -08:00
964f8b63bd
Add pkg/parsers/architecture and pkg/platform
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
2015-11-14 23:03:02 +01:00
3e0bec1370
/info: Add keys Architecture, OSType
...
- introduces Swarm-relevant keys, see #13634
- docs updated
Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com >
Upstream-commit: 4e8fcd40028ed09b139b6f86954e676a1839be9c
Component: engine
2015-11-14 22:21:45 +01:00
6acf716496
Merge pull request #17009 from azurezk/user-checkers
...
add c.Assert in docker_cli_ps_test.go
Upstream-commit: 31a6e01f4772bb9f385254e0731a9f06c7e6ef49
Component: engine
2015-11-14 20:22:15 +01:00
ffe3114f57
Windows: Fix regresion on first boot
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8da449055fd2fb60e45391c8482865dca3d0232f
Component: engine
2015-11-14 11:06:19 -08:00
42d5166bfc
Merge pull request #17758 from rhatdan/dynbinary
...
Since default is dynbinary we should test with dynbinary
Upstream-commit: fb77b822ad2bb5d097ebd19a6ad4825b967a52ab
Component: engine
2015-11-14 10:54:03 -08:00
8d0649a213
correct ltdl for centos
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 41619f4a902927767d149524b45d23ab9569636b
Component: engine
2015-11-14 08:50:58 -08:00
6f1a30b2e2
Merge pull request #17851 from Microsoft/10662-ArgumentEscaping
...
Prevent double escaping of Dockerfile commands on Windows
Upstream-commit: ad8a66573c61483b9a0721470438dfc8bd01993f
Component: engine
2015-11-14 17:25:53 +01:00
2b045a190b
Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
...
New version of notary with pkcs11 client integration
Upstream-commit: 7a6f2cdeeb88f340649a459697f79548759767dd
Component: engine
2015-11-14 12:03:29 +01:00
dd78f03b3f
Since default is dynbinary we should test with dynbinary
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 0d47b74a7f3f42640d0714b651417415461b1b8c
Component: engine
2015-11-14 06:01:55 -05:00
d096521f7f
Adding test for the fix #17168 .
...
The test case creates a mount point, starts the daemon with the
graph dir pointing to the mount and initates a pull request. We should
be able to check for the error message when the mount point gets filled
during pull.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 4699ef8f87cc270fdf9e18bad5582b6696d56fe4
Component: engine
2015-11-14 16:24:45 +05:30
5ad61db1c1
Fix for #17168 misleading pull error
...
This fix avoids overwritting the previous error messages, ensures the client gets the correct error messages and not just the most recent message during the pull request.
For this `var lastErr` replaced with a slice which acts as a temp place holder for the list of returned error messages for every attempt.
The slice is later joined and returned to the caller function after searching for the image with diffirent versions(v2,v1,v0).
Updated the code with check for no space left on device error occurance and prevent the
daemon on falling back to v1,v0.
Incorporated the comments from @calavera, @RichardScothern, @cpuguy83
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 31cdc63419a29badad2d79590db83fe617ee8e03
Component: engine
2015-11-14 16:24:45 +05:30
