clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-27 03:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,873 Commits 9 Branches 112 Tags
06b922c63f660be431e4b678a50ae1ddb0dcf882
Commit Graph

16873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Murdaca 06b922c63f Merge pull request #14801 from HuKeping/golint 
golint: use golint to check package util
 2015-07-21 18:09:39 +02:00
Hu Keping 17ce34116a golint: use golint to check package util 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-07-22 05:34:13 +08:00
Brian Goff 6c95040e3b Merge pull request #14765 from runcom/fix-dockerCmd-refactor 
Refactor missed dockerCmd changes
 2015-07-21 11:53:28 -04:00
Alexander Morozov 380959dd68 Merge pull request #14609 from ewindisch/apparmor-policy 
Move AppArmor policy to contrib & deb packaging
 2015-07-21 08:48:02 -07:00
Antonio Murdaca 9818d8fa22 Merge pull request #14796 from WeiZhang555/golint-network 
golint on daemon/network package
 2015-07-21 17:37:40 +02:00
Eric Windisch 80d99236c1 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>
 2015-07-21 11:05:53 -04:00
Zhang Wei 7be8336fb5 golint on daemon/network package 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-07-21 22:49:49 +08:00
moxiegirl 1ca737875d Merge pull request #14725 from charleswhchan/issue-14433 
Issue #14433
 2015-07-21 07:48:54 -07:00
Arnaud Porterie a7d61882c0 Merge pull request #14778 from thaJeztah/remove-rhel6-rpm-from-generate 
Remove reference to CENTOS6 from generate script
 2015-07-21 07:27:29 -07:00
Sebastiaan van Stijn 739f7b1da6 Merge pull request #14731 from Evalle/14729-Fix-ubuntu-doc-issue 
Fixing ubuntu doc issue
 2015-07-21 15:51:11 +02:00
Brian Goff 5a29f0ac88 Merge pull request #14798 from coolljt0725/minor_fix_TestLogsStderrInStdout 
Minor fix of TestLogsStderrInStdout
 2015-07-21 09:33:34 -04:00
Lei 2e7daffd7b Minor fix of TestLogsStderrInStdout 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-21 20:37:14 +08:00
Sebastiaan van Stijn 1e9394103c Merge pull request #14727 from vdemeester/opts-docs-updates 
Update documentation according to opts updates (#13694)
 2015-07-21 14:19:29 +02:00
Vincent Demeester dc8b765930 Update documentation according to opts updates 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-21 14:08:19 +02:00
Sebastiaan van Stijn 197c9010bc Merge pull request #14766 from runcom/remove-ref-from-libcontainer 
Remove reference to docker/libcontainer
 2015-07-21 12:49:36 +02:00
Sebastiaan van Stijn f0473eaf01 Merge pull request #14744 from gesellix/add-gradle-docker-remote-api-plugin 
Add gradle docker remote api plugin
 2015-07-21 08:34:08 +02:00
Sven Dowideit 2eda00c861 Merge pull request #14757 from rhatdan/man 
Fix man pages
 2015-07-21 16:08:02 +10:00
Tibor Vass efd56bbe6f Merge pull request #14779 from duglin/BetterErrMsg14774 
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
 2015-07-20 20:40:06 -04:00
Doug Davis 4d0990a753 Merge pull request #14762 from LK4D4/lint_reexec 
Add docstring to reexec.Command
 2015-07-20 20:37:27 -04:00
Antonio Murdaca 4c0fb85729 Merge pull request #14776 from MHBauer/cliconfig-lint 
golint fixes for cliconfig
 2015-07-21 02:22:09 +02:00
Doug Davis 09a3b57f94 Merge pull request #14775 from runcom/move-nat-tests 
move nat tests from container's unit test to nat's ones
 2015-07-20 20:06:34 -04:00
Alexander Morozov 9738b9319b Add docstring to reexec.Command 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-20 17:00:18 -07:00
Morgan Bauer dea49b7474 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>
 2015-07-20 16:48:58 -07:00
Doug Davis 6751a49d14 Add better output for TestLinksEtcHostsContentMatch to help debug #14774 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-20 16:46:51 -07:00
Sebastiaan van Stijn 18ca5d7c0e Remove reference to CENTOS6 from generate script 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-07-21 01:21:33 +02:00
Antonio Murdaca 37d737fc2c Merge pull request #14691 from Microsoft/10662-start 
Windows: hostconfig on start
 2015-07-21 00:52:19 +02:00
Antonio Murdaca f2aff58483 move nat tests from container's unit test to nat's ones 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-21 00:29:24 +02:00
Arnaud Porterie cc7fe0d2d9 Merge pull request #14771 from Microsoft/10662-image2image 
Fixing Image struct to no longer use Graph.
 2015-07-20 15:25:06 -07:00
Sebastiaan van Stijn 8b7923620a Merge pull request #14768 from fredlf/style-guide-edits 
Small edits and clean up
 2015-07-21 00:23:56 +02:00
John Howard 9001ea26e7 Fixing Image struct to no longer use Graph. 
Signed-off-by:  John Howard <jhoward@microsoft.com>
 2015-07-20 13:59:53 -07:00
David Calavera bd8386c127 Merge pull request #14764 from sevki/14756-lint 
golint fix TLs->TLS in docker/
 2015-07-20 13:19:42 -07:00
Fred Lifton 6609cfb5e7 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)
 2015-07-20 11:59:48 -07:00
Antonio Murdaca bd328da555 Refactor missed dockerCmd changes 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-20 20:55:57 +02:00
Antonio Murdaca 691e3a3e70 Remove reference to docker/libcontainer 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-20 20:30:22 +02:00
Sevki Hasirci ce3156f1eb fix mixed typo TlS -> TLS 
Signed-off-by: Sevki Hasirci <s@sevki.org>
 2015-07-20 21:14:45 +03:00
Sevki Hasirci 16ea3cf3a3 golint fix TLs->TLS in docker/ 
Signed-off-by: Sevki Hasirci <s@sevki.org>
 2015-07-20 20:50:03 +03:00
David Calavera 46cbfcb168 Merge pull request #14746 from jfrazelle/remove-rhel-centos-6-rpm 
remove centos/rhel 6 from rpm builder
 2015-07-20 10:44:18 -07:00
David Calavera fc2f90fc63 Merge pull request #14741 from HuKeping/ci-refactor 
CI: use dockercmd when possible
 2015-07-20 09:49:40 -07:00
Hu Keping 27ac154d05 CI: use dockercmd when possible 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-07-21 04:40:15 +08:00
David Calavera ee7af0d2cb Merge pull request #14671 from hqhq/hq_use_dockerCmd 
Use dockerCmd when possible
 2015-07-20 09:44:42 -07:00
Dan Walsh 732141442a Fix man pages 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-07-20 11:47:59 -04:00
Tibor Vass 77bbee3d00 Merge pull request #14716 from LK4D4/update_libcontainer 
Update libcontainer to v0.0.2
 2015-07-20 11:33:19 -04:00
Antonio Murdaca c6a3517246 Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3 
Refactor: use dockerCmd when possible in integraiton-cli tests
 2015-07-20 16:00:38 +02:00
Sebastiaan van Stijn 46d7762f26 Merge pull request #14614 from hqhq/hq_simplify_swappiness 
Simplify swappiness check
 2015-07-20 13:51:39 +02:00
Qiang Huang 6f8ddec1d0 Simplify swappiness check 
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527

The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.

I don't think this would be a problem, because:
 - like all other default values like zero, we can't differentiate
   user specify it or not, most of which, zeros are also invalid, so
   default is default, we show these default values in help info,
   so users would know if they set value as default, it'll be like
   they set nothing.
 - we can't do this kind of string check in REST api request, so
   it'll make the behave different from docker command and RESTapi.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-20 16:10:10 +08:00
Qiang Huang 668e2369cc dockerCmd when possible 
Addresses: #14603

integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-20 14:55:40 +08:00
Lei eef6eda7d2 Recfactor: Use dockerCmd when possible in integration-cli tests 
Part of #14603
integration-cli/docker_cli_links_test.go (coolljt0725)
integration-cli/docker_cli_links_unix_test.go (coolljt0725)
integration-cli/docker_cli_logs_test.go (coolljt0725)
integration-cli/docker_cli_nat_test.go (coolljt0725)
integration-cli/docker_cli_network_test.go (coolljt0725)
integration-cli/docker_cli_stats_test.go (coolljt0725)
integration-cli/docker_cli_tag_test.go (coolljt0725)
integration-cli/docker_cli_top_test.go (coolljt0725)
integration-cli/docker_cli_version_test.go (coolljt0725)
integration-cli/docker_cli_wait_test.go (coolljt0725

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-20 14:44:22 +08:00
Sven Dowideit 008d57bf7f Merge pull request #14747 from moxiegirl/update-docs-dockerfile 
Updating to use the new base
 2015-07-20 12:00:02 +10:00
Mary Anthony e0bceb7064 Updating to use the new base 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-19 15:39:43 -07:00
Jessica Frazelle af5fb9b7d0 remove centos6 from rpm builder 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-19 14:30:48 -07:00