c6ff072fba
Merge pull request #17610 from thaJeztah/add-env-example
...
Add examples for ENV vars in API
Upstream-commit: 7a2669f59683c9d286494fa1360c792cc501e98f
Component: engine
2015-11-06 01:19:58 +01:00
d46b75c80b
Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link
...
Fixed link to contribution page in docs/README.md.
Upstream-commit: a1ecd8e68cb373af2b02d75a222ac9ce07517665
Component: engine
2015-11-06 09:57:07 +10:00
13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
b31d380f40
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
Upstream-commit: 98ec6bc14c165a06cf510ca5714ce4e831d405e6
Component: engine
2015-11-05 15:11:02 -08:00
90a6db029c
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
Upstream-commit: b232362310c24a74c01741bb43ec3052ffe49f83
Component: engine
2015-11-05 15:00:48 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
0962f376e6
Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem
...
Update upstart init script to start on filesystem (not only on local ones).
Upstream-commit: 6417c53c5ac4a066a0743c595e53c599a21c1e7e
Component: engine
2015-11-05 13:51:07 -08:00
4925d54787
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
Upstream-commit: 31fa27d47ead9d3be08338a748ee9cc21c085183
Component: engine
2015-11-05 13:46:27 -08:00
b37ddbaf2b
Move errcode handling for resize upper
...
It'll allow to separate daemon layer more cleanly later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bb0e7eb196c65972ea66154461b7e654d776f92a
Component: engine
2015-11-05 13:42:33 -08:00
ce27d8b852
Merge pull request #17726 from runcom/fix-errors-format
...
Fix errors format
Upstream-commit: b52bedbd480b5029656733a449bd3596b8561e5a
Component: engine
2015-11-05 13:30:57 -08:00
bbe8f4c04c
Merge pull request #17678 from asbjornenge/tm_syntax_updates
...
Added ARG instruction and aligned with src repo
Upstream-commit: 8de3d630add946e97d2a1e4895de1b7691b0b842
Component: engine
2015-11-05 16:30:19 -05:00
44fac78e29
Merge pull request #17685 from WeiZhang555/cluster-parser
...
Fix `--cluster-store` option parser
Upstream-commit: c7b65288e458f51ea2d5adcb8692c279726a8292
Component: engine
2015-11-05 13:21:52 -08:00
723ed1d8d2
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
Upstream-commit: 9465d6ee6a669e4978ce746f16280910db7b1359
Component: engine
2015-11-05 15:55:47 -05:00
266b690d59
Update upstart init script to start on filesystem (not only on local ones).
...
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com >
Upstream-commit: 6f83dd22a36b57fdc75bd2b6cbce7572b0695f99
Component: engine
2015-11-05 20:38:52 +01:00
e5389225be
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
Upstream-commit: 3c6962f22d60e1afd43ebbf87ff5586f16131011
Component: engine
2015-11-05 11:16:40 -08:00
85d3458e13
Fix panic in parsing /etc/os-release
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7b102dc11486539bc661a4d858e2de3ce3f46493
Component: engine
2015-11-05 19:59:29 +01:00
97dac59e9f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b09a452c1f89e84b513ed7eaf567437291e0e50d
Component: engine
2015-11-05 19:59:28 +01:00
7928e48119
Merge pull request #17273 from stefanberger/apparmor_policy_1.9
...
More Rules for AppArmor
Upstream-commit: 5353ccb05c440f2961438f13d5812a844a501c28
Component: engine
2015-11-05 10:52:43 -08:00
2ba09b4e09
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9c5814171ce7ab3af48867da36f4d374f804c4a6
Component: engine
2015-11-05 10:18:24 -08:00
1bdb88a97a
Fix errors format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 77826333fe12fb444ac536e115f23f8e00db24a8
Component: engine
2015-11-05 18:17:37 +01:00
356e7220ae
Merge pull request #17725 from polonskiy/patch-1
...
fix typo
Upstream-commit: 336dea3e50144c5410ff693eb72bdc04ef40e914
Component: engine
2015-11-05 17:40:45 +01:00
d7b81a07c8
fix typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
Upstream-commit: 3f331eaa4092ff3a612a275351b82b44c778d9fa
Component: engine
2015-11-05 18:33:16 +02:00
60f7222f3f
More Rules for AppArmor
...
This patch addresses the following AppArmor complains:
type=AVC msg=audit(1445537397.873:547): apparmor="ALLOWED" operation="mount"
info="failed srcname match" error=-13 profile="/usr/bin/docker"
name="/.pivot_root602836504/" pid=11512 comm="exe" flags="rw, rprivate"
type=AVC msg=audit(1445537265.325:502): apparmor="ALLOWED"
operation="file_lock" profile="/usr/bin/docker"
name="/var/lib/docker/network/files/local-kv.db" pid=9574 comm="docker"
requested_mask="k" denied_mask="k" fsuid=0 ouid=0
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com >
Upstream-commit: 02411987ffc696e867ac202e79c82ac97b3ae69a
Component: engine
2015-11-05 11:06:18 -05:00
f5a3f3f5b7
Merge pull request #17722 from jeroenj/patch-1
...
Fixes typo in docs/userguide/dockervolumes.md
Upstream-commit: c05e1b7d57c31e2490676370428544a06e2ba636
Component: engine
2015-11-05 16:22:32 +01:00
c502ed0cdf
Updated link to https.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: f48f850a241fbfbf726b22756227f3fbb0db01a7
Component: engine
2015-11-05 09:20:20 -06:00
dcbc728ac9
Fixes typo in docs/userguide/dockervolumes.md
...
Signed-off-by: Jeroen Jacobs <git@jeroenj.be >
Upstream-commit: 75602d4930e7b7fa7c958329b544401756991d88
Component: engine
2015-11-05 16:08:11 +01:00
50aae3f0be
Merge pull request #17207 from azurezk/assert_docker_cli_help_test
...
update docker_cli_help_test.go
Upstream-commit: 22ef779db97362bbb8122933e32d87d92c7a0489
Component: engine
2015-11-05 15:15:52 +01:00
5299efe664
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
Upstream-commit: bb9eca90363eec052e101bb8ef3351d0218dccf9
Component: engine
2015-11-05 09:15:28 -05:00
281fcbcfb6
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
Upstream-commit: 71db33738d681ab7855998e414d426fcc26f16ea
Component: engine
2015-11-05 13:05:28 +01:00
0e4d37bec5
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
Upstream-commit: f267e4be54170855693d240e605ff9a4ee8e891d
Component: engine
2015-11-05 12:11:57 +01:00
f2cce82a28
Merge pull request #17717 from WeiZhang555/docsAndTypo
...
Fix docs typo and wrong word
Upstream-commit: 5baf56ca008fb221c45714a21cc3eca6db66c475
Component: engine
2015-11-05 11:35:33 +01:00
2d427f2dc5
Added ARG instruction and aligned with src repo
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: 8d7459140701006fb8e3a0550872ce55c43bcec0
Component: engine
2015-11-05 10:56:07 +01:00
7aba578a99
Merge pull request #17715 from cpuguy83/17708_fix_inspect_output_on_error
...
Reutrn immediately when inspect connection failed
Upstream-commit: 1eafc7264cd4e2d4acd9944683326234f06ec9ef
Component: engine
2015-11-04 22:43:02 -08:00
1172f3e1fb
Fix docs typo and wrong word
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 725b7c9d4332aee7bac0fa1bedacbabc6d2a2426
Component: engine
2015-11-05 14:17:37 +08:00
ca5fc035b7
Fix --cluster-store option parser
...
`--cluster-store` is of form KV-PROVIDER://KV-URL, this commit makes
sure that KV-URL contains no "://"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 0ebdac8bee0c587a8a10e3bcdec46e9d8360e2fb
Component: engine
2015-11-05 11:45:08 +08:00
cdd39c3396
Reutrn immediately when inspect connection failed
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 72aeb63a47bcdffe15380302ff09ab3f0447e476
Component: engine
2015-11-04 21:17:05 -05:00
fa6a6b811f
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
Upstream-commit: f18c5e9714face6eaa4ff63a32ecd6f01444ef4b
Component: engine
2015-11-04 19:23:11 -05:00
090b8fbc23
Merge pull request #17694 from hrldcpr/patch-1
...
fix documentation inconsistency for volume create
Upstream-commit: 1ef3b1f857859d8407155f88c86b9e2aee20955d
Component: engine
2015-11-05 01:16:09 +01:00
bedb26558b
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 3f2747943583c06dc3ee1744a5ffa4ce7c099c7c
Component: engine
2015-11-04 16:01:19 -08:00
e3dc181362
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
Upstream-commit: 236913f4e825d747b091e8eda07b48f8d62a41a9
Component: engine
2015-11-05 00:50:08 +01:00
63911eff34
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
Upstream-commit: 9c1006c8bf2efc71659ec3b5412ce987661decca
Component: engine
2015-11-04 15:39:19 -08:00
f9edf991b3
Optimize Create Container to skip extra mount on Windows.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 9112d90b27c3bf13b8d1c41eb288c63868c53747
Component: engine
2015-11-04 14:43:50 -08:00
9d6270e06f
Merge pull request #17705 from alexwlchan/patch-1
...
Fix typo in dockervolumes.md
Upstream-commit: fa0ee3fb89289049a506376fb1356797e07d0932
Component: engine
2015-11-04 14:26:47 -08:00
d20f80e318
Fix typo in dockervolumes.md
...
Signed-off-by: Alex Chan <alex@alexwlchan.net >
Upstream-commit: 40dc0c4861df0e087ffe43c416176a58f574e641
Component: engine
2015-11-04 22:13:35 +00:00
a73cd6bc2a
Merge pull request #17639 from mrjana/restart
...
Fix a corner case issue when daemon panics
Upstream-commit: b2f14f9bec0c4c8f14e9ac5446fbb49d88310bae
Component: engine
2015-11-04 13:37:45 -08:00
6cd1649ca5
Verify Endpoint.Info() before accessing it
...
- During concurrent operations in multihost environment,
it is possible that the implementer of `EndpointInfo`
is nil. It simply means the endpoint is no longer
available in the datastore.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 54d22cbd9a04a965c935a693bf403d2c87109b5a
Component: engine
2015-11-04 13:27:17 -08:00
32476a2302
Merge pull request #17698 from moxiegirl/nigel-fixes
...
Fixing BTRFS > Btrfs
Upstream-commit: 92132a7841883d912ab2003dc2aa956ceaa05bdb
Component: engine
2015-11-04 22:05:27 +01:00
f66555fbae
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 41de7a18d8f231568977e66bb58a6a02545d49d9
Component: engine
2015-11-04 15:18:50 -05:00
d016054c79
Merge pull request #17184 from cpuguy83/fix_external_volume_tests
...
Fix bug in volume driver test implementation
Upstream-commit: 37849ce1fbba7dd32110d78c0d7db0074afd67e9
Component: engine
2015-11-04 12:08:11 -08:00
