fc3bf55518
Windows: Work around Windows BS/DEL behavior
...
In Windows containers in TP5, DEL is interpreted as the delete key, but
Linux generally interprets it as backspace. This prevents backspace from
working when using a Linux terminal or the native console terminal
emulation in Windows.
To work around this, translate DEL to BS in Windows containers stdin when
TTY is enabled. Do this only for builds that do not have the fix in
Windows itself.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: f124829c9b35377de2a8316b7e23aa7a8c5d7b23
Component: engine
2016-05-20 19:04:20 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
ad7b4ee301
Merge pull request #22582 from aboch/vnd
...
Vendoring libnetwork b66c038
Upstream-commit: 14b5a50f0a95a2b8f3ed7ab7469bbab02189a09c
Component: engine
2016-05-18 10:55:28 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
ebf20baa9c
update URL for docker-volume-netshare
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: 7b3dc03b663df7f8812057e9e524026d49568432
Component: engine
2016-05-15 21:20:54 -07:00
3a2ddb47c0
Merge pull request #22751 from igrcic/docs-small-typo-reference-attach
...
remove double "using" in reference attach docs
Upstream-commit: 6e12d0720fc6acdf55ee98013b33b6846645f153
Component: engine
2016-05-16 01:22:43 +02:00
e0797b6f12
remove double "using" in reference attach docs
...
Signed-off-by: Ivan Grcic <igrcic@gmail.com >
Upstream-commit: 0884dca124beac751964256234b3b3d4e402b21a
Component: engine
2016-05-15 23:18:01 +02:00
6d28e0d9be
Merge pull request #22742 from yongtang/05142016-update-deprecated-docs-for-LXC-built-in-exec-driver
...
Update deprecated docs for LXC built-in exec driver
Upstream-commit: 1bcc42e0386814abdef491afa605ece79cc081d4
Component: engine
2016-05-15 05:47:09 +02:00
06085eef27
Update deprecated docs for LXC built-in exec driver
...
The LXC built-in exec driver has been deprecated in 1.8 and
further removed in 1.10, yet in deprecated.md it still shows:
```
Target For Removal In Release: v1.10
```
This fix changes the above to `Removed In Release:`.
In addition, lxc-conf flag and API fields have already been
removed in 1.10 as well so the related description has also been
updated in this fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1391e75d451c8e9c51b8cd29d90e6043e59f0f04
Component: engine
2016-05-14 17:30:19 -07:00
b05c7c0eca
Merge pull request #22743 from yongtang/05142016-typo-in-work-with-networks
...
Fix a typo in work-with-networks.md
Upstream-commit: e333675cd783f3e5e208fefbf71528ed643b9e1c
Component: engine
2016-05-15 02:15:45 +02:00
John Starks
Vincent Demeester
Phil Estes
Sebastiaan van Stijn
Sebastiaan van Stijn
Fabrizio Soppelsa
Nirmal Mehta
Alexander Morozov
Wendel Fleming
Antonio Murdaca
Wang Xing
Zunayed Ali
John Howard
Lin Lu
Mrunal Patel
Brian Goff
Aleksa Sarai
Alessandro Boch
mansinahar
Tibor Vass
Antonio Murdaca
Qiang Huang
Jeremy Unruh
Ivan Grcic
Yong Tang