Commit Graph

17520 Commits

Author SHA1 Message Date
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
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
81c277327c Merge pull request #15381 from calavera/carry_15275
[Carry 15275] Runtime sysinfo check
Upstream-commit: 6168a992c7a99b3dd2b961da9c2909fdcb72f229
Component: engine
2015-08-06 16:48:22 -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
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
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
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
633fc50b5d Merge pull request #15350 from jfrazelle/revert-apparmor-stuff
revert apparmor changes back to how it was in 1.7.1
Upstream-commit: 287e8167f2a2d8f192fe0d7891cc034ae0d661c1
Component: engine
2015-08-06 13:57:55 -07: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
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
23d0cda657 Remove pkg/systemd
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 931645c46056ae24b2df51c447b6df1a66b2ca30
Component: engine
2015-08-06 14:35:00 +02:00
d8e23349e8 Vendor coreos/go-systemd/daemon
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 61c9f4db4140be5abdc0e3dc0d2284420a8c6c28
Component: engine
2015-08-06 14:34:40 +02:00
18046b8656 Adapt container settings after verify platform container settings.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 08b3dc8d9f11e42e1ef6dc7a5b5ee70dd5b55306
Component: engine
2015-08-06 19:56:51 +08:00
9733f459f8 Use docker daemon for intergation test daemon start
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b8a8ac9b58404d04a5483de4ea75bf2de3dd5fe1
Component: engine
2015-08-06 16:20:57 +08:00
70f70bf8d8 Merge pull request #15335 from moxiegirl/boot2docker-remove-refs
Boot2Docker Cleanup 
Upstream-commit: ad5355151ce233388df0d5b8a1c3b3e7a6ba9077
Component: engine
2015-08-06 08:48:57 +02:00
748adf137d Merge pull request #15313 from Microsoft/10662-fixcertdir
Windows: [TP3] Fix certificate directory for registry
Upstream-commit: 5b289cd1aaf81c8d147a27b4af50c61f9e3cbc1b
Component: engine
2015-08-05 22:59:51 -04:00
26a62f2497 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cc375a1e48d0f4b3855e7f14b09ead244bbbadfb
Component: engine
2015-08-05 19:45:43 -07:00
bf6ea4035c Merge pull request #15075 from hqhq/hq_move_cpushare_change
Cleanup: Merge adjustCpuShares to adoptContainerSettings
Upstream-commit: 3273209a9cbd09d181e7f80df8236e7ea8d8a38e
Component: engine
2015-08-05 21:53:58 -04:00
b34758fee9 Merge pull request #15354 from coolljt0725/remove_redundant_ip_forward_check
Remove redundant ip_forward check
Upstream-commit: 263220fa3067f7565062983a3e056c7b6e7eee2e
Component: engine
2015-08-05 18:52:44 -07:00
84f01a56ed Merge pull request #15353 from jlhawn/fixing-concurrency-trust
[graph] Use a pipe for downloads to write progress
Upstream-commit: af9dc3050bd17a4b2fa3e05835b39c865f6bdc31
Component: engine
2015-08-05 18:52:27 -07:00
a2702aceb2 Merge pull request #15352 from icecrime/fix_pause_tests
Use busybox in 'pause' tests
Upstream-commit: 6805241fe2a41dac88b45879eac9c013341f6f04
Component: engine
2015-08-06 03:14:44 +02:00
fc48931914 [graph] Use a pipe for downloads to write progress
The process of pulling an image spawns a new goroutine for each layer in the
image manifest. If any of these downloads fail we would stop everything and
return the error, even though other goroutines would still be running and
writing output through a progress reader which is attached to an http response
writer. Since the request handler had already returned from the first error,
the http server panics when one of these download goroutines makes a write to
the response writer buffer.

This patch prevents this crash in the daemon http server by waiting for all of
the download goroutines to complete, even if one of them fails. Only then does
it return, terminating the request handler.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: d80c4244d322fe0a9cbdd996d23e37fb5b089544
Component: engine
2015-08-05 18:13:39 -07:00
Lei
9d17a532e6 Remove redundant ip_forward check
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6a0050d0f0600cf17c0fe5dcca0d24d65e70d818
Component: engine
2015-08-06 09:06:31 +08:00
b5f711f36e Merge pull request #15119 from xnox/sdnotify
systemd: set service type to notify.
Upstream-commit: efe4f0dfa92b6de558f3b46adc6e12e777a5ca30
Component: engine
2015-08-05 17:42:58 -07:00
b8e884831a Use busybox in 'pause' tests
Don't assume that any random image will have 'top' and explicitely use
the busybox image for testing.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3529e3dac78a18df46d4010a58c9f9d741b42fab
Component: engine
2015-08-05 17:35:20 -07:00
3ec8bc1fa3 Cleanup: Merge adjustCPUShares to adoptContainerSettings
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e0af23dc18eac17633ab1f2541f26b56c303a18c
Component: engine
2015-08-06 08:15:14 +08:00
a9c377d5a8 Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
image_delete: move name check first
Upstream-commit: 044c4e00a0688f710d3b37bfb54d711f6955068d
Component: engine
2015-08-06 02:07:34 +02:00
9d9a4fd0c0 Merge pull request #15252 from coolljt0725/14765_enable_golint_3
Enable golint in pkg/archive
Upstream-commit: 8534090476b6eae66f1eca81e8bc0e0c61ed7197
Component: engine
2015-08-05 19:27:48 -04:00
43b0434b22 Merge pull request #15345 from calavera/fix_ps_format_error
Fail fail when the ps format template is invalid.
Upstream-commit: d93eca2250bd89ca57e29f25268c1774eb34875f
Component: engine
2015-08-05 19:19:33 -04:00
245054e124 Merge pull request #15001 from fmoliveira/master
Adding support for elementary OS distro in install script.
Upstream-commit: a8e67849b98e14ac11e2114ba477e239a617be05
Component: engine
2015-08-05 16:14:47 -07:00
2bbb5f5c44 Windows: Test infrastructure plumbing
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: da44d0fccba3ace90face348a415632dee75d14e
Component: engine
2015-08-05 14:34:32 -07:00
c46f64c6a9 Merge pull request #15346 from Microsoft/minortypo
Minor typo in test-and-docs.md
Upstream-commit: 565535073f4ad879bbd15b0af81a70c6e6379501
Component: engine
2015-08-05 22:27:18 +02:00
d750e0c75b Windows: Fix certificate directory for registry
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 831b00303f1979dda6ed66980fc32a65f9229768
Component: engine
2015-08-05 13:25:41 -07:00
ef703e5bbc Minor typo in test-and-docs.md
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b5eea8f33b20bf480bc7c496b12818483dffb96b
Component: engine
2015-08-05 13:22:39 -07:00
82b6f1602c Fail fail when the ps format template is invalid.
Fixes error continuing execution when the parsing fails.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3d3db0d4af6cf483299a152133f19f9df760dc11
Component: engine
2015-08-05 13:22:24 -07:00
8d6881c74a Merge pull request #15336 from Microsoft/fixwindowsci
Windows: Fix for CI
Upstream-commit: aec46ac0b20ea0c912148fcda12207db1bf93c1b
Component: engine
2015-08-05 13:11:59 -07:00