Commit Graph

20395 Commits

Author SHA1 Message Date
9b317da6c1 Remove note from docker version 1.3 on Env variables
Fixes #14734

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 89ec5399aff830ed0b00ff24610969fbf9ad4fdc
Component: engine
2015-08-07 14:36:06 -07:00
130868c480 Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
Remove pkg/systemd from validate-lint
Upstream-commit: 7ac357c7954283b29276044cb4225551c0f4d8d3
Component: engine
2015-08-07 14:31:12 -07:00
3ab9629bd8 Update Windows TP3 registry endpoints
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: c7e1f91a9efc44a65e70913373e014abfb16f057
Component: engine
2015-08-07 14:03:46 -07:00
2be825f7f0 Added support for creating a cliconfig.ConfigFile via io.Reader
Signed-off-by: Kevin Shi <kshi@andrew.cmu.edu>
Upstream-commit: 34679e568a22b4f35ff8460f3b5b7bf7089df818
Component: engine
2015-08-07 14:02:03 -07:00
8af88451b7 Remove pkg/systemd from validate-lint
Following #15330, pkg/systemd doesn't exists anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b8559991dcc97c3defee89ed70c3b616152ef583
Component: engine
2015-08-07 22:26:45 +02:00
d3651d98fc Merge pull request #15014 from brahmaroutu/lint_daemon_graphdriver_overlay
daemon/graphdriver/overlay/ fix lint errors/warnings
Upstream-commit: 511009531081cf38a162e7b94b78427243124449
Component: engine
2015-08-07 13:06:56 -07:00
b0a38c37db Merge pull request #15370 from cpuguy83/better_error_on_client_connect
Better/more specific error messages on connect
Upstream-commit: 0262d40ba7d2edc67077a17aebbcdca1e2472a1e
Component: engine
2015-08-07 13:00:44 -07:00
7b7445d1b7 Fixes #15349 too many apis
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1d5f479e01388e1bffcd61f9c3896093ac82d5d0
Component: engine
2015-08-07 11:37:05 -07:00
d20356ab98 daemon/graphdriver/overlay/ fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: de3944219f23ffe3ac83add4c1f2b0ec0a4cd5c0
Component: engine
2015-08-07 18:34:59 +00:00
c8706706f4 Merge pull request #14897 from WeiZhang555/golint-api-types
fix golint warnings/errors on package api/types/
Upstream-commit: 0a0e9701f7bbe58e75eff9d1934fde0a5038ee9c
Component: engine
2015-08-07 10:51:27 -07:00
8778d71536 Merge pull request #14828 from brahmaroutu/lint_graph_tags
/graph/tag fix lint errors/warnings
Upstream-commit: b1009d1fdd551a57e7c266d9cc8122ed3f80aa2c
Component: engine
2015-08-07 10:49:26 -07:00
461b0e0926 Merge pull request #14811 from devx/refactor-clientRequestAttemptLogin
Cleanup: Factor cmdAttempt out of cli.clientRequestAttemptLogin
Upstream-commit: 70cae97ee25cacd11868c95338e864e4f0b6681c
Component: engine
2015-08-07 10:47:18 -07:00
3709a03001 Make official install instructions use curl instead of wget
YOU GO CURL

Fixes #14650

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: c76fef1791106ca60b7f913a895a77251b695c0a
Component: engine
2015-08-07 10:16:09 -07:00
2781bd4bd9 Add platformSupported flag to enable daemon mode by platform.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 10d30c64579639f30aa857a881cd813a75193887
Component: engine
2015-08-07 09:45:24 -07:00
df2cbb3ee4 Merge pull request #15371 from ankushagarwal/flags
Add test to check if subcommands are sorted
Upstream-commit: 38e5764132a535a76b0525a6b357ebba22fe272f
Component: engine
2015-08-07 12:21:00 -04:00
e16f2386a3 Merge pull request #15392 from Microsoft/js/vendor_ansiterm
Update vendored go-ansiterm for Windows console
Upstream-commit: 27fd64c67f2db82917db7a5248fc20309295bb13
Component: engine
2015-08-07 09:01:31 -07:00
e53902e3e1 Merge pull request #15385 from jfrazelle/gpg-passphrase-rpm-sign-fix
Gpg passphrase rpm sign fix
Upstream-commit: a8026239fc7d52a7cfe61c4d36fe6f7c14c8081e
Component: engine
2015-08-07 08:53:51 -07:00
87c1161542 Just add some code doc around the use of AddXXX func to avoid any confusion
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 592908c0f5dbad90205764002d7b0079ad18b7a4
Component: engine
2015-08-07 08:07:27 -07:00
a3035b6b7d doc: add a notice about memory accounting overhead
The documentation for Debian and Ubuntu explains how to enable memory
and swap accounting but doesn't explain why it is disabled in the first
place. The problem with those subsystems is that they incurs a
performance hit even when not used at all. Add this explanation.

The provided figure are quite vague. The memory overhead is easily
verifiable. It is for example cited in [RedHat documentation][]. For the
performance hit, maybe the performance is better now, but a few years
ago, it was said to be [between 6 and 15%][].

The goal is that people don't just enable memory accounting if they
don't have a use for it.

[RedHat documentation]: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Resource_Management_Guide/sec-memory.html
[between 6 and 15%]: https://lwn.net/Articles/517562/

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 56b33e9f27fa9dc50cec16392ca01bd4234390f9
Component: engine
2015-08-07 14:31:33 +02:00
508816d55a Add test to check if subcommands are sorted
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 4d212f7853912a2826e1cc725d831515553fde9c
Component: engine
2015-08-07 01:34:21 -07:00
3c26a4792f 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>
Upstream-commit: ecf528fcb6d236eae9b1e187152c774393c199fe
Component: engine
2015-08-06 20:48:02 -07:00
5024eec3d4 Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile
remove docker-unconfined profile we were not using it
Upstream-commit: b9094633f361c1881172fc38e4f91de5659f671b
Component: engine
2015-08-06 20:06:33 -07:00
502a6d4faf fix golint warnings/errors on package api/types/
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 3d6617ffe7d9242107ac09eab4f2d8ce87acb95c
Component: engine
2015-08-07 09:43:43 +08:00
8e338445b7 Remove unnecessary func parameter, add mirror endpoint test
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: c016d2defdd640f0dcba384999482e3c80602c30
Component: engine
2015-08-07 02:25:41 +01:00
70e2333c7e 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>
Upstream-commit: 38295d4b48fed3d9569100543a25e46b21deba46
Component: engine
2015-08-06 20:37:28 -04:00
e67b461c56 Merge pull request #15351 from SvenDowideit/remove-hub-v1-documentation
Removing Hub v1 documentation, Hub v2 documentation will come from th…
Upstream-commit: 818190b1fff6d77a1025d96b31fc114930fe8363
Component: engine
2015-08-07 10:33:15 +10:00
c3a2ab168f Merge pull request #15141 from Microsoft/10662-cp
Windows [TP3] - make docker cp functional
Upstream-commit: 04cd81401ad721cc3e1222c08fd81a1133737548
Component: engine
2015-08-06 17:15:09 -07:00
59f2aefefe remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: e542238f2a4ba9d77bf8ebc77e319dd6b321925f
Component: engine
2015-08-06 16:51:01 -07:00
9b8412fbbf remove unused images
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9f530aba7f24ddd8e4003e27db6fca5c6d4cc638
Component: engine
2015-08-06 23:34:29 +00:00
927b6c6e4b fix rpm signing so it does not open a tty w question
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 203776a40c2c692375b5618a3b392cb119879f04
Component: engine
2015-08-06 16:18:40 -07:00
8b8aa7835d Removing Hub v1 documentation, Hub v2 documentation will come from that repository
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 70092b3ee06106cddfecb1093d8612a2f3fc6b21
Component: engine
2015-08-06 23:00:49 +00:00
0f41d6e091 Remove pointers from the SysInfo struct.
Because they can just be values.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c2bc637a0306657a86f3739bd5bdcd5db8d22539
Component: engine
2015-08-06 15:57:21 -07:00
04959972e4 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)
Upstream-commit: 4177b0bae04bb41dfff65ea87b2efb87811e08e6
Component: engine
2015-08-06 15:46:10 -07:00
0655529aa6 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)
Upstream-commit: b2d06b6fba307a8972d08477ef8b711e31ace433
Component: engine
2015-08-06 15:46:09 -07:00
65fa196e4f Merge pull request #15378 from tiborvass/dont-push-to-mirror
registry: Do not push to mirrors
Upstream-commit: 6b341f2b9d14cf31eb3dadd24ac44e9cffd5ff92
Component: engine
2015-08-06 15:30:06 -07:00
718ef2107f Merge pull request #15376 from aboch/ep
Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
Upstream-commit: fe6c0e44be3eb1e72ed4ce17864a36c8287a7ca6
Component: engine
2015-08-06 15:14:01 -07:00
2cced695e9 to not keep old debs for experimental
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: aadb3407d3f524625b7d5db754f66949c82dc5ad
Component: engine
2015-08-06 14:49:05 -07:00
9970a2eed5 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>
Upstream-commit: b899977ee283d6bccf35ad9a079ed92a291ad34c
Component: engine
2015-08-06 17:41:59 -04:00
f147ed75c5 Merge pull request #15320 from hqhq/hq_add_cgroup_check
Check sysinfo for Cpuset cpu.shares and blkio
Upstream-commit: 9ce0a20c01ec0a8e0c3a1a45fba566600e7e9d4d
Component: engine
2015-08-06 14:23:37 -07:00
658ec62413 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e35a5ae463507debc25fc372622cf7b0b27b6d36
Component: engine
2015-08-06 14:23:25 -07:00
13560065bd Better/more specific error messages on connect
Closes #15309

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9994a35b5d4af281304b5146f88a225b9237712e
Component: engine
2015-08-06 16:41:37 -04:00
e46c794117 revert apparmor changes back to how it was in 1.7.1, but keep tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ed248207d74ac59fb190be31dee96c6a8cef68da
Component: engine
2015-08-06 12:49:25 -07:00
ba5470c56c Documenting Docker release process
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 612a1fb4ab3f5ca841bf1e0dc9898eb0d6862e4e
Component: engine
2015-08-06 11:42:27 -07:00
efe044b445 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>
Upstream-commit: 2a237615c0915b60b8dc6c13a377bb766780ecbf
Component: engine
2015-08-06 11:22:38 -07:00
e3faf36a82 Merge pull request #15361 from hqhq/hq_use_docker_daemon
Use docker daemon for intergation test daemon start
Upstream-commit: c471b7aba50f5034bf44853b1dd3520bd02391ac
Component: engine
2015-08-06 10:40:49 -07:00
79a2fad9ef Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify
Adapt container settings after verify platform container settings.
Upstream-commit: 33ed76b0f79e639e9ad3d35ee39afa3d9216c500
Component: engine
2015-08-06 10:16:54 -07:00
973372c692 Merge pull request #15240 from vdemeester/cliconfig-test-coverage
Add unit test (coverage) to package cliconfig
Upstream-commit: 4640c4abe8c8893fb12f1adbd4089de473c78657
Component: engine
2015-08-06 13:16:04 -04:00
d1cc5964d9 Merge pull request #15330 from runcom/refactor-pkg-systemd
Vendor go-systemd daemon and refactor pkg systemd
Upstream-commit: f6106fc3ceaee0389a69e082f99ef531e5c67824
Component: engine
2015-08-06 10:02:04 -07:00
729643faab Add unit test to pkg cliconfig (and thus coverage)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 73ad1b267420f36ab68a0eff524cc2181a788b98
Component: engine
2015-08-06 18:02:25 +02:00
a1b4849c0d Merge pull request #15213 from Microsoft/10662-cliwindowsdaemon
Windows: Test infrastructure plumbing
Upstream-commit: 57c8f4244b6e6093ceeb58ac6ca53b2b95b26e2d
Component: engine
2015-08-06 11:25:22 -04:00