moxiegirl
00843d18d8
Merge pull request #15312 from yyekhlef/fedora_22_doc
...
Fedora 22 manual network configuration and ip forwarding
2015-08-08 12:59:11 -07:00
moxiegirl
030df72279
Merge pull request #15408 from ankushagarwal/env-var-docs
...
Make Environment replacement note less kludgy
2015-08-08 12:56:19 -07:00
moxiegirl
22d539866c
Merge pull request #15409 from ankushagarwal/wgetcurl
...
Make official install instructions use curl instead of wget
2015-08-08 12:51:48 -07:00
Brian Goff
cc73fc03e8
Merge pull request #15421 from maaquib/15418-ps-image-id-too-wide
...
Truncating image id is docker ps to a length of 12
2015-08-08 07:48:16 -04:00
Brian Goff
764aa1a583
Merge pull request #15074 from coolljt0725/14756_enable_golint_2
...
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
2015-08-08 07:14:53 -04:00
Arnaud Porterie
bf892dcfcc
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
2015-08-08 01:08:49 -07:00
Arnaud Porterie
46f40c34d2
Merge pull request #15424 from coolljt0725/typo_remove_useless_period
...
Typo: remove unconsistent period in docker info
2015-08-08 01:04:38 -07:00
Lei Jitang
dc2a7ab750
Typo: remove unconsistent period in docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 13:06:59 +08:00
Alexander Morozov
03f969d0b3
Merge pull request #15423 from HuKeping/if-else
...
Remove useless if-else
2015-08-07 21:54:30 -07:00
Hu Keping
c536cec5ea
Remove useless if-else
...
It is better to use simple form without else.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-08-08 20:02:44 +08:00
Lei Jitang
5220f3b535
Enable golint in pkg/jsonlog and pkg/jsonmessage.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 11:28:22 +08:00
David Calavera
196aa6d62d
Merge pull request #14965 from stefanberger/nohidevols2
...
Have network files mounted read-only when -v parameter has 'ro' passed
2015-08-07 19:10:59 -07:00
Mohammed Aaqib Ansari
1a2ccf59ee
Truncating image id to 12 in docker ps
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-08-07 20:53:48 -04:00
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
Ankush Agarwal
89ec5399af
Remove note from docker version 1.3 on Env variables
...
Fixes #14734
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-08-07 14:36:06 -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
Ankush Agarwal
c76fef1791
Make official install instructions use curl instead of wget
...
YOU GO CURL
Fixes #14650
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-08-07 10:16:09 -07: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
Stefan Berger
38295d4b48
Have network files mounted read-only when -v parameter has 'ro' passed
...
Have network files mounted read-only when mounted using the -v
open and -v parameter has 'ro' passed.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-06 20:37:28 -04: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 0d2628cdf19783106ae8723f51fae0a7c7f361c6)
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 472b6f66e03f9a85fe8d23098dac6f55a87456d8)
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