Commit graph

17546 commits

Author SHA1 Message Date
Veres Lajos
5146232723 typofix - https://github.com/vlajos/misspell_fixer
Signed-off-by: Veres Lajos <vlajos@gmail.com>
2015-08-07 23:25:49 +01:00
David Calavera
1e2765dabb Merge pull request #15109 from kevishi/new-config-reader
Added support for creating a cliconfig.ConfigFile via io.Reader
2015-08-07 14:43:55 -07:00
Arnaud Porterie
4f349cdd4b Merge pull request #14719 from icecrime/14662_update_issue_triage
Update issue triaging process
2015-08-07 14:37:31 -07:00
Alexander Morozov
7ac357c795 Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
Remove pkg/systemd from validate-lint
2015-08-07 14:31:12 -07:00
Kevin Shi
34679e568a Added support for creating a cliconfig.ConfigFile via io.Reader
Signed-off-by: Kevin Shi <kshi@andrew.cmu.edu>
2015-08-07 14:02:03 -07:00
Vincent Demeester
b8559991dc Remove pkg/systemd from validate-lint
Following #15330, pkg/systemd doesn't exists anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-07 22:26:45 +02:00
David Calavera
5110095310 Merge pull request #15014 from brahmaroutu/lint_daemon_graphdriver_overlay
daemon/graphdriver/overlay/ fix lint errors/warnings
2015-08-07 13:06:56 -07:00
David Calavera
0262d40ba7 Merge pull request #15370 from cpuguy83/better_error_on_client_connect
Better/more specific error messages on connect
2015-08-07 13:00:44 -07:00
Srini Brahmaroutu
de3944219f daemon/graphdriver/overlay/ fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-07 18:34:59 +00:00
David Calavera
0a0e9701f7 Merge pull request #14897 from WeiZhang555/golint-api-types
fix golint warnings/errors on package api/types/
2015-08-07 10:51:27 -07:00
David Calavera
b1009d1fdd Merge pull request #14828 from brahmaroutu/lint_graph_tags
/graph/tag fix lint errors/warnings
2015-08-07 10:49:26 -07:00
David Calavera
70cae97ee2 Merge pull request #14811 from devx/refactor-clientRequestAttemptLogin
Cleanup: Factor cmdAttempt out of cli.clientRequestAttemptLogin
2015-08-07 10:47:18 -07:00
Brian Goff
510ecbf371 Merge pull request #15407 from calavera/daemon_supported_flag
Add platformSupported flag to enable daemon mode by platform.
2015-08-07 13:45:10 -04:00
David Calavera
10d30c6457 Add platformSupported flag to enable daemon mode by platform.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-07 09:45:24 -07:00
Doug Davis
38e5764132 Merge pull request #15371 from ankushagarwal/flags
Add test to check if subcommands are sorted
2015-08-07 12:21:00 -04:00
Arnaud Porterie
27fd64c67f Merge pull request #15392 from Microsoft/js/vendor_ansiterm
Update vendored go-ansiterm for Windows console
2015-08-07 09:01:31 -07:00
Arnaud Porterie
a8026239fc Merge pull request #15385 from jfrazelle/gpg-passphrase-rpm-sign-fix
Gpg passphrase rpm sign fix
2015-08-07 08:53:51 -07:00
Brian Goff
81c679acae Merge pull request #15405 from duglin/BFlagDoc
Just add some code doc around the use of AddXXX func to avoid any confusion
2015-08-07 11:47:18 -04:00
Doug Davis
592908c0f5 Just add some code doc around the use of AddXXX func to avoid any confusion
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-08-07 08:07:27 -07:00
Ankush Agarwal
4d212f7853 Add test to check if subcommands are sorted
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-08-07 01:34:21 -07:00
root
ecf528fcb6 Update vendored go-ansiterm for Windows console
This update fixes Windows client console bugs and increases VT100
compatibility. With this change, nano and emacs become usable, and bash
works better.

Signed-off-by: John Starks <jostarks@microsoft.com>
2015-08-06 20:48:02 -07:00
David Calavera
b9094633f3 Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile
remove docker-unconfined profile we were not using it
2015-08-06 20:06:33 -07:00
Zhang Wei
3d6617ffe7 fix golint warnings/errors on package api/types/
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-08-07 09:43:43 +08:00
Sven Dowideit
818190b1ff Merge pull request #15351 from SvenDowideit/remove-hub-v1-documentation
Removing Hub v1 documentation, Hub v2 documentation will come from th…
2015-08-07 10:33:15 +10:00
Arnaud Porterie
04cd81401a Merge pull request #15141 from Microsoft/10662-cp
Windows [TP3] - make docker cp functional
2015-08-06 17:15:09 -07:00
Jessica Frazelle
e542238f2a remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-06 16:51:01 -07:00
David Calavera
6168a992c7 Merge pull request #15381 from calavera/carry_15275
[Carry 15275] Runtime sysinfo check
2015-08-06 16:48:22 -07:00
Sven Dowideit
9f530aba7f remove unused images
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-06 23:34:29 +00:00
Jessica Frazelle
203776a40c fix rpm signing so it does not open a tty w question
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-06 16:18:40 -07:00
Sven Dowideit
70092b3ee0 Removing Hub v1 documentation, Hub v2 documentation will come from that repository
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-06 23:00:49 +00:00
Antonio Murdaca
4177b0bae0 Add hostConfig check before starting a container
It may happen that host system settings are changed while the daemon is running.
This will cause errors at libcontainer level when starting a container with a
particular hostConfig (e.g. hostConfig with memory swappiness but the memory
cgroup was umounted).
This patch adds an hostConfig check on container start to prevent the daemon
from even calling libcontainer with the wrong configuration as we're already
doing on container's creation).

Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 0d2628cdf1)
2015-08-06 15:46:10 -07:00
Antonio Murdaca
b2d06b6fba Move sysinfo out of daemon struct
sysinfo struct was initialized at daemon startup to make sure
kernel configs such as device cgroup are present and error out if not.
The struct was embedded in daemon struct making impossible to detect
if some system config is changed at daemon runtime (i.e. someone
umount the memory cgroup). This leads to container's starts failure if
some config is changed at daemon runtime.
This patch moves sysinfo out of daemon and initilize and check it when
needed (daemon startup, containers creation, contaienrs startup for
now).

Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 472b6f66e0)
2015-08-06 15:46:09 -07:00
David Calavera
6b341f2b9d Merge pull request #15378 from tiborvass/dont-push-to-mirror
registry: Do not push to mirrors
2015-08-06 15:30:06 -07:00
David Calavera
fe6c0e44be Merge pull request #15376 from aboch/ep
Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
2015-08-06 15:14:01 -07:00
Tibor Vass
b899977ee2 registry: Do not push to mirrors
This patch splits LookupEndpoints into LookupPullEndpoints and
LookupPushEndpoints so that mirrors added with --registry-mirror are
skipped in the list returned by LookupPushEndpoints.

Fixes https://github.com/docker/distribution/issues/823

Signed-off-by: Tibor Vass <tibor@docker.com>
2015-08-06 17:41:59 -04:00
David Calavera
9ce0a20c01 Merge pull request #15320 from hqhq/hq_add_cgroup_check
Check sysinfo for Cpuset cpu.shares and blkio
2015-08-06 14:23:37 -07:00
Alessandro Boch
e35a5ae463 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-08-06 14:23:25 -07:00
David Calavera
287e8167f2 Merge pull request #15350 from jfrazelle/revert-apparmor-stuff
revert apparmor changes back to how it was in 1.7.1
2015-08-06 13:57:55 -07:00
Brian Goff
9994a35b5d Better/more specific error messages on connect
Closes #15309

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-06 16:41:37 -04:00
Jessica Frazelle
ed248207d7 revert apparmor changes back to how it was in 1.7.1, but keep tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-06 12:49:25 -07:00
John Howard
2a237615c0 Windows - make docker cp functional
Signed-off-by: John Howard <jhoward@microsoft.com>

Conflicts:
	pkg/archive/copy.go

Make it compile

Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-06 11:22:38 -07:00
Jessie Frazelle
c471b7aba5 Merge pull request #15361 from hqhq/hq_use_docker_daemon
Use docker daemon for intergation test daemon start
2015-08-06 10:40:49 -07:00
David Calavera
33ed76b0f7 Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify
Adapt container settings after verify platform container settings.
2015-08-06 10:16:54 -07:00
Brian Goff
4640c4abe8 Merge pull request #15240 from vdemeester/cliconfig-test-coverage
Add unit test (coverage) to package cliconfig
2015-08-06 13:16:04 -04:00
Alexander Morozov
f6106fc3ce Merge pull request #15330 from runcom/refactor-pkg-systemd
Vendor go-systemd daemon and refactor pkg systemd
2015-08-06 10:02:04 -07:00
Vincent Demeester
73ad1b2674 Add unit test to pkg cliconfig (and thus coverage)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-06 18:02:25 +02:00
Tibor Vass
57c8f4244b Merge pull request #15213 from Microsoft/10662-cliwindowsdaemon
Windows: Test infrastructure plumbing
2015-08-06 11:25:22 -04:00
Antonio Murdaca
931645c460 Remove pkg/systemd
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-08-06 14:35:00 +02:00
Antonio Murdaca
61c9f4db41 Vendor coreos/go-systemd/daemon
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-08-06 14:34:40 +02:00
Lei Jitang
08b3dc8d9f Adapt container settings after verify platform container settings.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-06 19:56:51 +08:00