Commit Graph
24262 Commits
Author SHA1 Message Date
Darren Shepherd d17ab45ce6 Remove DOCKER_HTTP_HOST_COMPAT env var
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 989f6f852f639404f8e86e179ce5389e2d29c5d2
Component: engine
2016-05-21 21:32:00 -07:00
Sebastiaan van Stijn a24dcb8ba0 Merge pull request #22876 from Microsoft/jjh/docsclarification
Docs: JSON vs Shell clarification
Upstream-commit: e3079b470494a596bc8b35bc682e7c82ac9f0f9f
Component: engine
2016-05-21 11:52:49 +02:00
Vincent Demeester 035b0db1ec Merge pull request #22775 from Microsoft/jjh/removewindowsdiff
Windows: Remove windowsdiff graph driver
Upstream-commit: 7311d687e032b63715da74e327dfc06d3dba3b42
Component: engine
2016-05-21 08:02:20 +02:00
Vincent Demeester bd09171248 Merge pull request #22863 from Saser/replace-unicode-single-quote
Replace occurrences of U+2018 and U+2019 with U+0027 in manpages
Upstream-commit: 4afc4edd74a49fe35b4e19f9fc813523387d85c0
Component: engine
2016-05-21 07:42:26 +02:00
John Howard db5e90b511 Docs: JSON vs Shell clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0cacd4bee2197e66105d960507f2ccac0f040263
Component: engine
2016-05-20 20:56:08 -07:00
John Howard b94b3df539 Windows: Remove windowsdiff driver
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dd0fc2be8b8b0bbac3d3a478ae6939d9b742612d
Component: engine
2016-05-20 16:18:19 -07:00
Christian Persson 8b67707840 Replace U+2018 and U+2019 with U+0027 in manpages
Signed-off-by: Christian Persson <saser@live.se>
Upstream-commit: 19c43a69156ba70c5fa11a7cc55ecbd82f8d9421
Component: engine
2016-05-20 20:15:57 +02:00
Vincent Demeester ed6e5fbdf6 Merge pull request #22820 from thaJeztah/suppress-incorrect-warning
Suppress "IPv4 forwarding" warning for --net=host
Upstream-commit: 52debcd58ac91bf68503ce60561536911b74ff05
Component: engine
2016-05-20 17:17:10 +02:00
Phil Estes cf71126b55 Merge pull request #22369 from vdemeester/carry-pr-25074
Carry #20574 : Add a --filter option to `docker search`
Upstream-commit: 642b7b1b52cd6ab618051f158d2d5c5c6ed56b3c
Component: engine
2016-05-20 10:13:30 -05:00
Sebastiaan van Stijn dea6010f20 Merge pull request #22839 from thaJeztah/update-selinux-example
Remove MLS example from SELinux example in run reference
Upstream-commit: 74ee26ccebee1f33375967f32529a63e33ee6b73
Component: engine
2016-05-20 15:11:35 +02:00
Sebastiaan van Stijn de6e0e2745 Remove MLS example from SELinux example in run reference
Automatic translation of MLS labels is currently not
supported, so should not be documented as an example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 841cf6fffb6a821d6c5777871090c9d2bcc95b36
Component: engine
2016-05-20 14:58:58 +02:00
Fabrizio Soppelsa 214a2bf487 Add a --filter option to docker search
The filtering is made server-side, and the following filters are
supported:

* is-official (boolean)
* is-automated (boolean)
* has-stars (integer)

Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e009ebdf4c0bf0ff64da8d48eefad63d0644de3e
Component: engine
2016-05-20 13:41:28 +02:00
Sebastiaan van Stijn f66ae64dbf Merge pull request #22554 from justincormack/seccap
Align default seccomp profile with selected capabilities
Upstream-commit: 0e9009bae3a493cfce8a8334949b239efcb88f43
Component: engine
2016-05-20 12:58:28 +02:00
Vincent Demeester 83971d6338 Merge pull request #22844 from normalfaults/mispell
fixed spelling error in cli pull local test
Upstream-commit: 55cc1a2aa46616930a8b8357db562067138822a9
Component: engine
2016-05-20 08:51:29 +02:00
Vincent Demeester 30a34f8a22 Merge pull request #22843 from normalfaults/bugfix
removed unused const in config.go
Upstream-commit: 4c49adeaed6881e8c0ad65ba62df99a5b86aded7
Component: engine
2016-05-20 08:50:33 +02:00
Vincent Demeester c2a010af33 Merge pull request #22000 from runcom/malformed-host-header-upstream
Ignore invalid host header between go1.6 and old docker clients
Upstream-commit: 6024fc4d49560266b564c2bcff92d5961d9936a3
Component: engine
2016-05-20 08:34:00 +02:00
Nirmal Mehta f157ec9b75 fixed spelling error in cli pull local test
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
Upstream-commit: f66f5d4bdc8ee12a2005df43bd279352705473d5
Component: engine
2016-05-19 17:52:42 -05:00
Alexander Morozov 512cd9c6e9 Merge pull request #22842 from wendelfleming/FixWorkDir
builder: fixed workdir comment
Upstream-commit: de908dfd2cfb640d7e55cb5092a59b75eb846948
Component: engine
2016-05-19 15:23:45 -07:00
Nirmal Mehta 18845bac64 removed unused const in config.go
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
Upstream-commit: b3b5da3c555b8cc622c7e9ace73951b1e09c8b35
Component: engine
2016-05-19 17:18:06 -05:00
Wendel Fleming 084ac6917b builder: fixed workdir comment
Signed-off-by: Wendel Fleming <wfleming@usc.edu>
Upstream-commit: 131161bbc7a153eac0eccf02fcfb0fc2f5d368b5
Component: engine
2016-05-19 15:40:46 -05:00
Antonio Murdaca 6b7262967f Ignore invalid host header between go1.6 and old docker clients
BenchmarkWithHack-4	   50000	     37082 ns/op	  44.50
MB/s	    1920 B/op	      30 allocs/op
BenchmarkNoHack-4  	   50000	     30829 ns/op	  53.52
MB/s	       0 B/op	       0 allocs/op

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3d6f5984f52802fe2f4af0dd2296c9e2e4a1e003
Component: engine
2016-05-19 21:07:45 +02:00
Alexander Morozov 6088ac5362 Merge pull request #22762 from wangxing1517/fix_mistake_400_for_500
Fix bug which mistakes 400 error for 500
Upstream-commit: 376c15bbaa05d1458d9a0238b8854af5de2738a1
Component: engine
2016-05-19 12:04:52 -07:00
Vincent Demeester de1f1fb963 Merge pull request #22481 from mrunalp/pid_container
Add support for --pid=container:<id>
Upstream-commit: ebeb5a0422be47e703353e327606a380eb9962ab
Component: engine
2016-05-19 19:00:40 +02:00
Wang Xing b96d544c7a Fix bug which mistakes 400 error for 500
Signed-off-by: Wang Xing <hzwangxing@corp.netease.com>
Upstream-commit: beca2615782e24fa28803ada067129fdfa88c77d
Component: engine
2016-05-19 20:01:55 +08:00
Sebastiaan van Stijn 5eb70b665b Merge pull request #22821 from zunayed/patch-1
fix duplicate command in uninstall instructions
Upstream-commit: 1691fe6d23b083c67aea120f05c4797220388d59
Component: engine
2016-05-18 22:26:25 +02:00
Zunayed Ali 77d9ae179d fix duplicate command in uninstall instructions
Signed-off-by: Zunayed Ali <zunayed@gmail.com>
Upstream-commit: 160a6430a91de00c065fe5900e7fd96a46f87a45
Component: engine
2016-05-18 20:12:29 +00:00
Alexander Morozov 1643154ef7 Merge pull request #22812 from thaJeztah/variable-typo
fix typo in variable
Upstream-commit: 083dcd9c644e35129f21934ee401e0698b0d3c62
Component: engine
2016-05-18 12:04:21 -07:00
John Howard d414f8f4a0 Merge pull request #22712 from swernli/update_fix
Fixing Windows update logic.
Upstream-commit: 04eaa7490192ce101dec3ee3a7a0d02bb1e81426
Component: engine
2016-05-18 12:00:10 -07:00
Sebastiaan van Stijn fac63eb804 Suppress "IPv4 forwarding" warning for --net=host
Containers using the host network stack (--net=host)
are not affected by "ip-forwarding" being disabled,
so there's not need to show a warning.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5fb7f9b29e9a85f36d02c4ecec6c04498fdb4315
Component: engine
2016-05-18 20:10:31 +02:00
Sebastiaan van Stijn a6422fdd0e fix typo in variable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: aac6008800ab06047ff000d6af487f3b52ba3019
Component: engine
2016-05-18 15:26:16 +02:00
Alexander Morozov ef177628bc Merge pull request #22765 from cyphar/update-boltdb
vendor: bump boltdb to v1.2.1
Upstream-commit: af705ca0ae1af735661ae464cb53d93a890450e7
Component: engine
2016-05-18 06:03:02 -07:00
Vincent Demeester e4cff6bd8f Merge pull request #22778 from DoraALin/10972-docs-Support-for-non-proxied-private-registry
doc:http pkg variables info added in pull cmd
Upstream-commit: 9751170f08a143e86709879c70b4a924c3161683
Component: engine
2016-05-18 13:58:24 +02:00
Lin Lu 0bd075bc45 doc:proxy-setting info added in pull cmd.
Replace Note with a new secion, reduce characters in
per line in 80. Add statement suggested by
https://github.com/thaJeztah

Signed-off-by: Lin Lu <doraalin@163.com>
Upstream-commit: 60940b0818d1d483cd017469f3e5ad21edce6198
Component: engine
2016-05-18 18:16:22 +08:00
Vincent Demeester 8fe06d66da Merge pull request #22785 from runcom/fix-flaky-network
TestPsGroupPortRange: allocate less ports
Upstream-commit: cbc404a0832bd95cce95783b87475d761be3a922
Component: engine
2016-05-18 11:08:10 +02:00
Vincent Demeester ad7b4ee301 Merge pull request #22582 from aboch/vnd
Vendoring libnetwork b66c038
Upstream-commit: 14b5a50f0a95a2b8f3ed7ab7469bbab02189a09c
Component: engine
2016-05-18 10:55:28 +02:00
Mrunal Patel 612ad97231 Add support for --pid=container:<id>
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: fb43ef649bc6aa11ca19c0e046518e85e1c7e2fa
Component: engine
2016-05-17 13:49:05 -04:00
Vincent Demeester f38f115e61 Merge pull request #22768 from mansinahar/run-cmd-doc
Update 'run' command doc for better readability.  Issue:#22721
Upstream-commit: 28a436af3641f202287f98e326537a10897da9fa
Component: engine
2016-05-17 17:06:12 +02:00
Brian Goff 82eeb64f5a Merge pull request #22788 from thaJeztah/fix-typo-in-completion
Fix typo in zsh completion
Upstream-commit: 713b9541f5aa19aceaf18d7a8765d2fdda9d786a
Component: engine
2016-05-17 08:26:25 -05:00
Sebastiaan van Stijn 052290c835 Fix typo in zsh completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 09cb57b773d1b83773120da3c4382defa37cf257
Component: engine
2016-05-17 13:38:46 +02:00
Antonio Murdaca d4479244ab TestPsGroupPortRange: allocate less ports
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: bdb354f19b485238c42a86ff2a61fc7537da15ee
Component: engine
2016-05-17 12:23:37 +02:00
Aleksa Sarai e6cdd2f8c3 vendor: bump boltdb to v1.2.1
This includes a fix to soft database corruption that would cause Docker
to fail to start if the daemon died in the middle of a transaction
write.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: a7781b130c537ba7c2ea0dde0c47b0d79f1d6629
Component: engine
2016-05-17 16:19:35 +10:00
Alessandro Boch 0a494f1920 Docker changes for libnetwork vendoring b66c038
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 6eb2b903a39f66ce88155eb1c062c085e4959e39
Component: engine
2016-05-16 15:04:01 -07:00
Alessandro Boch fe8b5c5d29 Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1f9e3815aa4ac7eaa707f3a9b436f23c29355a8f
Component: engine
2016-05-16 15:04:01 -07:00
Alessandro Boch 6b362b5e63 Update libnetwork dependencies for b66c038
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ebcf785f2fd81f52f06a0ea83baa4be698605876
Component: engine
2016-05-16 15:04:01 -07:00
John Howard f4ab66e327 Merge pull request #22728 from Microsoft/jstarks/improve_import
Windows: reexec during layer import
Upstream-commit: 4c6838137c10e322ce2bd64ce6db0df652e14267
Component: engine
2016-05-16 11:08:05 -07:00
mansinahar a8dfbf45a8 Update 'run' command doc for better readability
Signed-off-by: Mansi Nahar <mansi.nahar@macbookpro-mansinahar.local>
Upstream-commit: 01c9b968bdec8ba1202eacc5ec5c7edb361db6ce
Component: engine
2016-05-16 12:49:18 -04:00
Tibor Vass 30fc6309f3 Merge pull request #22561 from cpuguy83/delay_start_for_discovery
Wait for discovery on container start error
Upstream-commit: 0088b8fbbea9ca360f8a57cb63c7adc50b4613b0
Component: engine
2016-05-16 09:57:19 -04:00
Antonio Murdaca 860cdd60f1 Merge pull request #22761 from hqhq/hq_check_config_kmem
Update check_config for MEMCG_KMEM
Upstream-commit: 16e6211cf7ffcdaae11e4ded61d0e15b52c1c8a4
Component: engine
2016-05-16 12:38:21 +02:00
Vincent Demeester 806d0d8277 Merge pull request #22757 from gondor/master
Documentation: Updated URL to plugin reference - docker-volume-netshare
Upstream-commit: 37dfd8bc8c83462958fc507937c8baf5d5b06bfc
Component: engine
2016-05-16 08:39:31 +02:00
Qiang Huang 00eb665726 Update check_config for MEMCG_KMEM
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default
since 4.6, so it's merged to CONFIG_MEMCG.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 27d7b135d4475b8c7b5159792b9b6d160e4535c1
Component: engine
2016-05-16 13:55:24 +08:00