38e34cf6da
Use name instead of container in Commit
...
It will make daemon interface separation easier later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-06 10:22:00 -08:00
cc207aa136
Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store
...
Fix potential races in the volume store
2015-11-06 08:48:12 -08:00
2c8b7c597a
devmapper: Provide more error information if blkid fails
...
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-06 08:21:20 -05:00
6ba7d04d16
Merge pull request #17753 from runcom/fix-typo-tests-reqs
...
integration-cli: requirements: fix typo
2015-11-06 07:02:51 -05:00
7dda44004d
Merge pull request #17746 from coolljt0725/remove_lxcconfig
...
Remove LxcConf in daemon_test.go and fix a typo
2015-11-06 12:21:33 +01:00
313b85fa47
integration-cli: requirements: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-06 12:15:42 +01:00
4a3cd88172
Fix missing `-d` flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
2015-11-06 11:53:17 +01:00
f1834153de
Merge pull request #17383 from Microsoft/10662-volumeerrors
...
Fix volume error messages
2015-11-05 21:58:03 -05:00
00d00b429f
Remove LxcConf in daemon_test.go and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-06 09:58:06 +08:00
5e2f31e992
Merge pull request #17696 from thaJeztah/update-ubuntu-install
...
Docs: add "Linux kernel extra" to manual install
2015-11-06 02:04:05 +01:00
7a2669f596
Merge pull request #17610 from thaJeztah/add-env-example
...
Add examples for ENV vars in API
2015-11-06 01:19:58 +01:00
a1ecd8e68c
Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link
...
Fixed link to contribution page in docs/README.md.
2015-11-06 09:57:07 +10:00
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
98ec6bc14c
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
2015-11-05 15:11:02 -08:00
b232362310
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
2015-11-05 15:00:48 -08:00
9c765040a5
Windows: Fix docker login
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-05 14:19:48 -08:00
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
3b5fac462d
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>
2015-11-05 17:09:57 -05:00
6417c53c5a
Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem
...
Update upstart init script to start on filesystem (not only on local ones).
2015-11-05 13:51:07 -08:00
31fa27d47e
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
2015-11-05 13:46:27 -08:00
bb0e7eb196
Move errcode handling for resize upper
...
It'll allow to separate daemon layer more cleanly later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-05 13:42:33 -08:00
b52bedbd48
Merge pull request #17726 from runcom/fix-errors-format
...
Fix errors format
2015-11-05 13:30:57 -08:00
8de3d630ad
Merge pull request #17678 from asbjornenge/tm_syntax_updates
...
Added ARG instruction and aligned with src repo
2015-11-05 16:30:19 -05:00
c7b65288e4
Merge pull request #17685 from WeiZhang555/cluster-parser
...
Fix `--cluster-store` option parser
2015-11-05 13:21:52 -08:00
9465d6ee6a
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
2015-11-05 15:55:47 -05:00
6f83dd22a3
Update upstart init script to start on filesystem (not only on local ones).
...
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com>
2015-11-05 20:38:52 +01:00
3c6962f22d
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
2015-11-05 11:16:40 -08:00
7b102dc114
Fix panic in parsing /etc/os-release
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-05 19:59:29 +01:00
b09a452c1f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-05 19:59:28 +01:00
5353ccb05c
Merge pull request #17273 from stefanberger/apparmor_policy_1.9
...
More Rules for AppArmor
2015-11-05 10:52:43 -08:00
9c5814171c
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-05 10:18:24 -08:00
77826333fe
Fix errors format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-05 18:17:37 +01:00
336dea3e50
Merge pull request #17725 from polonskiy/patch-1
...
fix typo
2015-11-05 17:40:45 +01:00
3f331eaa40
fix typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
2015-11-05 18:33:16 +02:00
02411987ff
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>
2015-11-05 11:06:18 -05:00
c05e1b7d57
Merge pull request #17722 from jeroenj/patch-1
...
Fixes typo in docs/userguide/dockervolumes.md
2015-11-05 16:22:32 +01:00
f48f850a24
Updated link to https.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-11-05 09:20:20 -06:00
75602d4930
Fixes typo in docs/userguide/dockervolumes.md
...
Signed-off-by: Jeroen Jacobs <git@jeroenj.be>
2015-11-05 16:08:11 +01:00
22ef779db9
Merge pull request #17207 from azurezk/assert_docker_cli_help_test
...
update docker_cli_help_test.go
2015-11-05 15:15:52 +01:00
bb9eca9036
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
2015-11-05 09:15:28 -05:00
71db33738d
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
2015-11-05 13:05:28 +01:00
f267e4be54
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
2015-11-05 12:11:57 +01:00
5baf56ca00
Merge pull request #17717 from WeiZhang555/docsAndTypo
...
Fix docs typo and wrong word
2015-11-05 11:35:33 +01:00
8d74591407
Added ARG instruction and aligned with src repo
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2015-11-05 10:56:07 +01:00
1eafc7264c
Merge pull request #17715 from cpuguy83/17708_fix_inspect_output_on_error
...
Reutrn immediately when inspect connection failed
2015-11-04 22:43:02 -08:00
725b7c9d43
Fix docs typo and wrong word
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-05 14:17:37 +08:00
0ebdac8bee
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>
2015-11-05 11:45:08 +08:00
72aeb63a47
Reutrn immediately when inspect connection failed
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-04 21:17:05 -05:00
6326e6732d
Revise commands in Compose section of multi-host quickstart
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-04 17:44:01 -08:00
f18c5e9714
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
2015-11-04 19:23:11 -05:00
Alexander Morozov