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
66c6bac35d
Fallback to file polling for jsonlog reader on err
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c136a33c5bf233f4ce108a8a8481d78aeaec93cc
Component: engine
2015-11-05 10:05:05 -05: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
8e86de45f2
Include container names in network inspect
...
This commit makes `docker network inspect` print container names as
service discovery is based on container name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: fbed26297dca2adc59d891c661548302ec848984
Component: engine
2015-11-05 19:16:13 +08: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
51204c03cd
Revise commands in Compose section of multi-host quickstart
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Upstream-commit: 6326e6732dd217ba6c53ba80ba917d72ad0d1ce5
Component: engine
2015-11-04 17:44:01 -08: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
5805b4b796
update release script and release process
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d0a4b216a68d0ea27b4604330ed779fa5ed96c35
Component: engine
2015-11-04 16:20:04 -08: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
365046209e
Fix potential races in the volume store
...
Uses finer grained locking so that each volume name gets its own lock
rather than only being protected by the global lock, which itself needs
to be unlocked during cetain operations (`create` especially`)
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: fe66fdd18c0307cc02e6aeff8625c179452b8436
Component: engine
2015-11-04 16:59:47 -05: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
03adf0dbf2
Merge pull request #17695 from runcom/restore-images-log
...
graph: do not error out if images can't be restored
Upstream-commit: 0cdc96cd8f04c3e34eae0712c81e4d4129ae8029
Component: engine
2015-11-04 11:45:44 -08:00
385f68dfda
Merge pull request #17578 from brahmaroutu/fix_unit_tests_gccgo
...
after the changes to unit test framework, fixing gccgo to run unit tests
Upstream-commit: d718388df71b3b56d71564f706ffde7c625dde02
Component: engine
2015-11-04 20:35:17 +01:00
b92bac632d
Do not rely on string comparison in truncindex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d4a8d09d1a7ced5c711fcc7a939986d22a0554eb
Component: engine
2015-11-04 11:34:05 -08:00
61a7faaa73
Fixing BTRFS > Btrfs
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 90e16ab8f97fc5146aab2e77a0fa6ec2d225ba32
Component: engine
2015-11-04 11:23:16 -08:00
5088f2b31c
Docs: add "Linux kernel extra" to manual install
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8e2b20580b82c3d63d4dbbff1d6bee5640a46a8b
Component: engine
2015-11-04 19:49:47 +01:00
9568550083
graph: do not error out if images can't be restored
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: eaa4047792d2495276383332c4ad4c573e5e8275
Component: engine
2015-11-04 19:46:54 +01:00
207b056583
fix documentation inconsistency for volume create
...
the example command uses `/world` but the description refers to `/src`
Signed-off-by: Harold Cooper <hrldcpr@gmail.com >
Upstream-commit: f67da614e9963e626d4ec12fd624249947b97d6a
Component: engine
2015-11-04 13:22:53 -05:00
a0c47a9e10
Merge pull request #17662 from calavera/decouple_container_and_daemon
...
Remove daemon field from within container.
Upstream-commit: 55711a22e0fdd339ef5196d9ecf282b93cd2b8bb
Component: engine
2015-11-04 10:21:58 -08:00
1820467533
Remove further references to the daemon within containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 63efc12070b2aff0f062ad62cc577cf2ffb66ef6
Component: engine
2015-11-04 12:28:54 -05:00
2b73c2cc80
Remove daemon field from container.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 444c82d19d3c8ee51f313c879d434ac5b8be6a6f
Component: engine
2015-11-04 12:27:49 -05:00
c61aec7054
Decouple daemon and container from the stats collector.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 5dc3a9a6da6ce6e3eee791251293cf045a4754f9
Component: engine
2015-11-04 12:27:49 -05:00
