Commit Graph

21804 Commits

Author SHA1 Message Date
788cff7e65 Merge pull request #14801 from HuKeping/golint
golint: use golint to check package util
Upstream-commit: 06b922c63f660be431e4b678a50ae1ddb0dcf882
Component: engine
2015-07-21 18:09:39 +02:00
4874e6060c golint: use golint to check package util
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 17ce34116af4e8c6b66d0c7906efcae2fd75efc6
Component: engine
2015-07-22 05:34:13 +08:00
5bcf01ef67 Add golint to the development toolbox
Add golint to the Dockerfile, and a `validate-lint` task to the
Makefile. Currently, the linter will process a harcoded list of packages
that will expand as we fix more warnings. Eventually, the linter should
process all subpackages of the repo (excluding vendored code).

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 6cce8d18384a5ae1212e7b0f7b7ac9662a89c8c1
Component: engine
2015-07-21 09:00:36 -07:00
7f0b167fb0 Fix cgroup parent tests
After merging mounting cgroups in container this tests doing wrong
checks. Cgroup paths could be prepended by other cgroups from host.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 844fc5f77c9443b4605949219a8a3c8523249025
Component: engine
2015-07-21 08:59:17 -07:00
25af73dba8 Merge pull request #14765 from runcom/fix-dockerCmd-refactor
Refactor missed dockerCmd changes
Upstream-commit: 6c95040e3b75725cb7230d7f9a22fdf36a4bb03a
Component: engine
2015-07-21 11:53:28 -04:00
84681c30e3 Merge pull request #14609 from ewindisch/apparmor-policy
Move AppArmor policy to contrib & deb packaging
Upstream-commit: 380959dd68cd56e60a2ea93cd7f26c8d88135483
Component: engine
2015-07-21 08:48:02 -07:00
ce0ada60b7 Merge pull request #14796 from WeiZhang555/golint-network
golint on daemon/network package
Upstream-commit: 9818d8fa22b919259bd46b93427fb9021a368389
Component: engine
2015-07-21 17:37:40 +02:00
a0b92d8385 golint: Lint pkg/namesgenerator
Also addded a couple more tests

Updates #14756

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: c5667bc5690d6004db4e515cef1865e093da7e3b
Component: engine
2015-07-21 16:33:34 +01:00
74cf202b4f Move AppArmor policy to contrib & deb packaging
The automatic installation of AppArmor policies prevents the
management of custom, site-specific apparmor policies for the
default container profile. Furthermore, this change will allow
a future policy for the engine itself to be written without demanding
the engine be able to arbitrarily create and manage AppArmor policies.

- Add deb package suggests for apparmor.
- Ubuntu postinst use aa-status & fix policy path
- Add the policies to the debian packages.
- Add apparmor tests for writing proc files
Additional restrictions against modifying files in proc
are enforced by AppArmor. Ensure that AppArmor is preventing
access to these files, not simply Docker's configuration of proc.
- Remove /proc/k?mem from AA policy
The path to mem and kmem are in /dev, not /proc
and cannot be restricted successfully through AppArmor.
The device cgroup will need to be sufficient here.
- Load contrib/apparmor during integration tests
Note that this is somewhat dirty because we
cannot restore the host to its original configuration.
However, it should be noted that prior to this patch
series, the Docker daemon itself was loading apparmor
policy from within the tests, so this is no dirtier or
uglier than the status-quo.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 80d99236c1ef9d389dbaca73c1a949da16b56b42
Component: engine
2015-07-21 11:05:53 -04:00
b04bea4cce golint on daemon/network package
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7be8336fb54ae2907c8f6549f26272c102a867af
Component: engine
2015-07-21 22:49:49 +08:00
46bf07aaed Merge pull request #14725 from charleswhchan/issue-14433
Issue #14433
Upstream-commit: 1ca737875d88384cfa3f36732b977ce07f60126a
Component: engine
2015-07-21 07:48:54 -07:00
b8b81760da Bump go-md2man to 1.0.3
Fixes an issue with curly braces being escaped when they should not be.
This was particularly an issue in places where `--format '{{ ...  }}'`
is used in the man docs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: dd7d4d1101102eb1d958bb948369a25ec08ab01d
Component: engine
2015-07-21 10:42:02 -04:00
84053f7c10 Merge pull request #14778 from thaJeztah/remove-rhel6-rpm-from-generate
Remove reference to CENTOS6 from generate script
Upstream-commit: a7d61882c0b65e9ccc0b64b019b63140164fb507
Component: engine
2015-07-21 07:27:29 -07:00
d7cb201163 Merge pull request #14731 from Evalle/14729-Fix-ubuntu-doc-issue
Fixing ubuntu doc issue
Upstream-commit: 739f7b1da65661123e5ad12e200c887a13c2d34d
Component: engine
2015-07-21 15:51:11 +02:00
76ec78cf5e Merge pull request #14798 from coolljt0725/minor_fix_TestLogsStderrInStdout
Minor fix of TestLogsStderrInStdout
Upstream-commit: 5a29f0ac884a2bab8cc582e6f8eca8bf59644ed1
Component: engine
2015-07-21 09:33:34 -04:00
81dcb09562 If a user hits this error it would be helpful to know tagstore name.
There are several bug reports on this error happening, and error is
not helpful unless you read the code.  Google brings up removing
the repositories.btrfs file.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 96a4469835c68e0b9c448344777fbff077b514ea
Component: engine
2015-07-21 09:26:27 -04:00
Lei
72f5aa2fcc Docs: update the devicemapper default basesize from 10G to 100G
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 36cc6a985be61cdcd9356385bc722c5ccad636b9
Component: engine
2015-07-21 20:46:31 +08:00
Lei
3d41f889fe Minor fix of TestLogsStderrInStdout
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2e7daffd7b3e004b5ac64ae1744e7f44252c979d
Component: engine
2015-07-21 20:37:14 +08:00
320928e0b8 Merge pull request #14727 from vdemeester/opts-docs-updates
Update documentation according to opts updates (#13694)
Upstream-commit: 1e9394103c9dee8fb363ac37695775fbc61b9c2d
Component: engine
2015-07-21 14:19:29 +02:00
5a80e110cb Update documentation according to opts updates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: dc8b765930168bbdce1189b702050b5a020c15af
Component: engine
2015-07-21 14:08:19 +02:00
cbb8acf897 Merge pull request #14766 from runcom/remove-ref-from-libcontainer
Remove reference to docker/libcontainer
Upstream-commit: 197c9010bc0ea2cfab444f68247776391f471730
Component: engine
2015-07-21 12:49:36 +02:00
6c8aab1b9c Merge pull request #14744 from gesellix/add-gradle-docker-remote-api-plugin
Add gradle docker remote api plugin
Upstream-commit: f0473eaf01002263f59139716a018d267c1bd6f1
Component: engine
2015-07-21 08:34:08 +02:00
0bc52bd67f Second level completions for --log-opt
Advanced completion for some log driver options:
gelf-address, syslog-address, syslog-facility.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d5aeb3398b6438ea5a1b3de4ec1e5f35d441f462
Component: engine
2015-07-21 08:25:14 +02:00
e0ecf28847 Merge pull request #14757 from rhatdan/man
Fix man pages
Upstream-commit: 2eda00c86180214d519b7119967e5820c4585b24
Component: engine
2015-07-21 16:08:02 +10:00
aacf99aa55 vendor fsnotify
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d241d2f36c64b24ef40d28afb28934b36cad539b
Component: engine
2015-07-20 22:47:03 -04:00
a746d5f280 Docker ps custom formatting.
Docker-DCO-1.1-Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 37209190c76de66531acba848f1537da2899e32d
Component: engine
2015-07-20 22:46:55 -04:00
596bdc6883 docker ps: add fields for ordering and column selection
* api/client/ps.go: Refactor CmdPs to use a fields list of
  characters to determine which columns to print on `docker ps`
  invocation.

This adds an ability for the docker command to print the columns of
output in arbitrary order.

Signed-off-by: Jeff Mickey <j@codemac.net>

Docker-DCO-1.1-Signed-off-by: Jeff Mickey <j@codemac.net>
Upstream-commit: de0e883331c85cc7617184900369e1ec9f723b6c
Component: engine
2015-07-20 22:45:21 -04:00
e8b152f0c3 Merge pull request #14779 from duglin/BetterErrMsg14774
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
Upstream-commit: efd56bbe6fe9b2725d45327e84b39601c726ca15
Component: engine
2015-07-20 20:40:06 -04:00
a69da4951f Merge pull request #14762 from LK4D4/lint_reexec
Add docstring to reexec.Command
Upstream-commit: 4d0990a753abbf1c7709dec7ea48a74ff87845fd
Component: engine
2015-07-20 20:37:27 -04:00
43e12ee399 Merge pull request #14776 from MHBauer/cliconfig-lint
golint fixes for cliconfig
Upstream-commit: 4c0fb857298fc8a6fcd97f53e017068ec056aba9
Component: engine
2015-07-21 02:22:09 +02:00
bd707ce47e Merge pull request #14775 from runcom/move-nat-tests
move nat tests from container's unit test to nat's ones
Upstream-commit: 09a3b57f941a9a3c3b7cbc35f2c8d1ff9bcea26f
Component: engine
2015-07-20 20:06:34 -04:00
2f038465a8 Add docstring to reexec.Command
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9738b9319b7a5133653c4912db8ec361af5847fc
Component: engine
2015-07-20 17:00:18 -07:00
66d10b96a0 golint for cliconfig
- fully capitalize HTTP in HTTPHeaders
 - comment for CONFIGFILE
 - camelcase and privatize oldConfigfile, defaultIndexserver
 - remove unused var errConfigFileMissing
 - comments for methods and functions throughout
 - external references to renamed variables changed

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: dea49b7474f0efcefe4618b6133330f0bb5e2c84
Component: engine
2015-07-20 16:48:58 -07:00
ae51c9aa8a Add better output for TestLinksEtcHostsContentMatch to help debug #14774
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6751a49d143e329668e4bbc3214c0bb5e4d02eeb
Component: engine
2015-07-20 16:46:51 -07:00
9acb0cc0fc Remove reference to CENTOS6 from generate script
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 18ca5d7c0e8582bf4e31a8ca1f5c6a5dbc58d55b
Component: engine
2015-07-21 01:21:33 +02:00
d803cf51a9 Merge pull request #14691 from Microsoft/10662-start
Windows: hostconfig on start
Upstream-commit: 37d737fc2ceba8d4daa3c3785f6050440a6a40c2
Component: engine
2015-07-21 00:52:19 +02:00
0388c1eb6b move nat tests from container's unit test to nat's ones
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: f2aff584830db5257489bcf76a4b364b79534b77
Component: engine
2015-07-21 00:29:24 +02:00
1ce6cfdc98 Merge pull request #14771 from Microsoft/10662-image2image
Fixing Image struct to no longer use Graph.
Upstream-commit: cc7fe0d2d96137e000f98d3917e60ab904e5f170
Component: engine
2015-07-20 15:25:06 -07:00
63185229e8 Merge pull request #14768 from fredlf/style-guide-edits
Small edits and clean up
Upstream-commit: 8b7923620ac5f7a40806e2ed22616231a5965b14
Component: engine
2015-07-21 00:23:56 +02:00
b70343dc2b Fixing Image struct to no longer use Graph.
Signed-off-by:  John Howard <jhoward@microsoft.com>
Upstream-commit: 9001ea26e7821239207586ad23c78c67d6926bfc
Component: engine
2015-07-20 13:59:53 -07:00
7eece0a108 Merge pull request #14764 from sevki/14756-lint
golint fix TLs->TLS in docker/
Upstream-commit: bd8386c127c09fd0392dd8b967b246c3bfa1362f
Component: engine
2015-07-20 13:19:42 -07:00
d43954849c Completion: Add support for '=' in arguments to __docker_pos_first_nonflag
This solves several problems that arise from the special treatment of
"=" in Bash.
The fix was required as some log drivers have options in a key=value
form. It also addresses the --option=value and the negated boolean syntax
(--boolean=false).

Note that this is not a general fix for these problems, it is limited to
the __docker_pos_first_nonflag function.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 38acec94c49e6730ae6bdef86b85f529c1dddda6
Component: engine
2015-07-20 21:22:56 +02:00
c8933bf1c2 Small edits and clean up
Signed-off-by: Fred Lifton <fred.lifton@docker.com>

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 6609cfb5e743b67e21c60296b0edda643551aa3b
Component: engine
2015-07-20 11:59:48 -07:00
f215de06a3 Refactor missed dockerCmd changes
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: bd328da55549dd71b3c24f27c660f1c26f277c15
Component: engine
2015-07-20 20:55:57 +02:00
09a470656b Remove reference to docker/libcontainer
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 691e3a3e7070ca43a9ad8f5f99c2563ccdce98a5
Component: engine
2015-07-20 20:30:22 +02:00
62e6e49ea2 Driver-specific completions for --log-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: faa8b658e7e7a0e827cf7e05f64dcd2e843452ac
Component: engine
2015-07-20 20:24:01 +02:00
27f60d9502 fix mixed typo TlS -> TLS
Signed-off-by: Sevki Hasirci <s@sevki.org>
Upstream-commit: ce3156f1ebab0857b686682b317410f0eb27f6d5
Component: engine
2015-07-20 21:14:45 +03:00
b663092054 Add missing log drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e09d0febe644f440e95a7a87e6fdfae8104743d6
Component: engine
2015-07-20 20:13:59 +02:00
e13211498b golint fix TLs->TLS in docker/
Signed-off-by: Sevki Hasirci <s@sevki.org>
Upstream-commit: 16ea3cf3a3cd0ce19f6c55138992442cd6cfddc8
Component: engine
2015-07-20 20:50:03 +03:00
e45c5f53f4 Merge pull request #14746 from jfrazelle/remove-rhel-centos-6-rpm
remove centos/rhel 6 from rpm builder
Upstream-commit: 46cbfcb168e046041fe79f8294223402d7396021
Component: engine
2015-07-20 10:44:18 -07:00