0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19641 commits 14 branches 412 tags 338 MiB
Commit graph

19641 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Murdaca
313b85fa47 integration-cli: requirements: fix typo 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-06 12:15:42 +01:00
Brian Goff
f1834153de Merge pull request #17383 from Microsoft/10662-volumeerrors 
Fix volume error messages
 2015-11-05 21:58:03 -05:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sven Dowideit
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
Solomon Hykes
2519f46550 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
 2015-11-05 15:22:37 -08:00
David Calavera
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
David Calavera
b232362310 Merge pull request #17735 from LK4D4/errcode_resize 
Move errcode handling for resize upper
 2015-11-05 15:00:48 -08:00
David Calavera
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
David Calavera
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
Tianon Gravi
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
Jess Frazelle
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
Alexander Morozov
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
David Calavera
b52bedbd48 Merge pull request #17726 from runcom/fix-errors-format 
Fix errors format
 2015-11-05 13:30:57 -08:00
Brian Goff
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
David Calavera
c7b65288e4 Merge pull request #17685 from WeiZhang555/cluster-parser 
Fix `--cluster-store` option parser
 2015-11-05 13:21:52 -08:00
Brian Goff
9465d6ee6a Merge pull request #17534 from Microsoft/10662-filterhyperv 
Windows: Add isolation to ps filter
 2015-11-05 15:55:47 -05:00
Julien Pervillé
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
Jess Frazelle
3c6962f22d Merge pull request #17677 from fboudra/master 
Remove yum cache to reduce image size
 2015-11-05 11:16:40 -08:00
Vincent Demeester
7b102dc114 Fix panic in parsing /etc/os-release 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-05 19:59:29 +01:00
Vincent Demeester
b09a452c1f Vendor mattn/go-shellwords 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-05 19:59:28 +01:00
Jess Frazelle
5353ccb05c Merge pull request #17273 from stefanberger/apparmor_policy_1.9 
More Rules for AppArmor
 2015-11-05 10:52:43 -08:00
John Howard
9c5814171c Windows: Add isolation to ps filter 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-05 10:18:24 -08:00
Antonio Murdaca
77826333fe Fix errors format 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-05 18:17:37 +01:00
Sebastiaan van Stijn
336dea3e50 Merge pull request #17725 from polonskiy/patch-1 
fix typo
 2015-11-05 17:40:45 +01:00
Anton Polonskiy
3f331eaa40 fix typo 
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
 2015-11-05 18:33:16 +02:00
Stefan Berger
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
Vincent Demeester
c05e1b7d57 Merge pull request #17722 from jeroenj/patch-1 
Fixes typo in docs/userguide/dockervolumes.md
 2015-11-05 16:22:32 +01:00
Christopher Jones
f48f850a24 Updated link to https. 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2015-11-05 09:20:20 -06:00
Jeroen Jacobs
75602d4930 Fixes typo in docs/userguide/dockervolumes.md 
Signed-off-by: Jeroen Jacobs <git@jeroenj.be>
 2015-11-05 16:08:11 +01:00
Antonio Murdaca
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
Brian Goff
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
Antonio Murdaca
71db33738d Merge pull request #17574 from Microsoft/10662-devicetool 
Windows: Fix docker device tool
 2015-11-05 13:05:28 +01:00
Vincent Demeester
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
Vincent Demeester
5baf56ca00 Merge pull request #17717 from WeiZhang555/docsAndTypo 
Fix docs typo and wrong word
 2015-11-05 11:35:33 +01:00
Asbjørn Enge
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
Alexander Morozov
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
Zhang Wei
725b7c9d43 Fix docs typo and wrong word 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-05 14:17:37 +08:00
Zhang Wei
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
Brian Goff
72aeb63a47 Reutrn immediately when inspect connection failed 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-11-04 21:17:05 -05:00
Brian Goff
f18c5e9714 Merge pull request #17703 from aboch/np 
Verify Endpoint.Info() before accessing it
 2015-11-04 19:23:11 -05:00
Sebastiaan van Stijn
1ef3b1f857 Merge pull request #17694 from hrldcpr/patch-1 
fix documentation inconsistency for volume create
 2015-11-05 01:16:09 +01:00
Jessica Frazelle
3f27479435
add script to test the old apt-repo 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-04 16:01:19 -08:00
Sebastiaan van Stijn
236913f4e8 Merge pull request #14012 from sallyom/exitCodes 
Change 'docker run' exit codes to distinguish docker/contained errors
 2015-11-05 00:50:08 +01:00
Jess Frazelle
9c1006c8bf Merge pull request #17673 from LK4D4/elim_str_comparison 
Do not rely on string comparison in truncindex
 2015-11-04 15:39:19 -08:00
Stefan J. Wernli
9112d90b27 Optimize Create Container to skip extra mount on Windows. 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2015-11-04 14:43:50 -08:00
David Calavera
fa0ee3fb89 Merge pull request #17705 from alexwlchan/patch-1 
Fix typo in dockervolumes.md
 2015-11-04 14:26:47 -08:00
Alex Chan
40dc0c4861 Fix typo in dockervolumes.md 
Signed-off-by: Alex Chan <alex@alexwlchan.net>
 2015-11-04 22:13:35 +00:00
Alexander Morozov
b2f14f9bec Merge pull request #17639 from mrjana/restart 
Fix a corner case issue when daemon panics
 2015-11-04 13:37:45 -08:00
Alessandro Boch
54d22cbd9a 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>
 2015-11-04 13:27:17 -08:00