clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,520 Commits 9 Branches 112 Tags
f83d05c3be3c3bcc84f6fa229504848ee8078321
Commit Graph
17520 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Batts f83d05c3be devicemapper: fix zero-sized field access 
Fixes: #15279

Due to
https://github.com/golang/go/commit/7904946eeb35faece61bbf6f5b3cc8be2f519c17
the devices field is dropped.

This solution works on go1.4 and go1.5

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-08-10 11:11:58 -04: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
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
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
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
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
Qiang Huang b8a8ac9b58 Use docker daemon for intergation test daemon start 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-06 16:20:57 +08:00
Sebastiaan van Stijn ad5355151c Merge pull request #15335 from moxiegirl/boot2docker-remove-refs 
Boot2Docker Cleanup
 2015-08-06 08:48:57 +02:00
Brian Goff 5b289cd1aa Merge pull request #15313 from Microsoft/10662-fixcertdir 
Windows: [TP3] Fix certificate directory for registry
 2015-08-05 22:59:51 -04:00
Mary Anthony cc375a1e48 - 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>
 2015-08-05 19:45:43 -07:00
Tibor Vass 3273209a9c Merge pull request #15075 from hqhq/hq_move_cpushare_change 
Cleanup: Merge adjustCpuShares to adoptContainerSettings
 2015-08-05 21:53:58 -04:00
Alexander Morozov 263220fa30 Merge pull request #15354 from coolljt0725/remove_redundant_ip_forward_check 
Remove redundant ip_forward check
 2015-08-05 18:52:44 -07:00
Alexander Morozov af9dc3050b Merge pull request #15353 from jlhawn/fixing-concurrency-trust 
[graph] Use a pipe for downloads to write progress
 2015-08-05 18:52:27 -07:00
Antonio Murdaca 6805241fe2 Merge pull request #15352 from icecrime/fix_pause_tests 
Use busybox in 'pause' tests
 2015-08-06 03:14:44 +02:00
Josh Hawn d80c4244d3 [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)
 2015-08-05 18:13:39 -07:00
Lei 6a0050d0f0 Remove redundant ip_forward check 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-06 09:06:31 +08:00
Jessie Frazelle efe4f0dfa9 Merge pull request #15119 from xnox/sdnotify 
systemd: set service type to notify.
 2015-08-05 17:42:58 -07:00
Arnaud Porterie 3529e3dac7 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>
 2015-08-05 17:35:20 -07:00
Qiang Huang e0af23dc18 Cleanup: Merge adjustCPUShares to adoptContainerSettings 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-06 08:15:14 +08:00
Antonio Murdaca 044c4e00a0 Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete 
image_delete: move name check first
 2015-08-06 02:07:34 +02:00
Tibor Vass 8534090476 Merge pull request #15252 from coolljt0725/14765_enable_golint_3 
Enable golint in pkg/archive
 2015-08-05 19:27:48 -04:00
Tibor Vass d93eca2250 Merge pull request #15345 from calavera/fix_ps_format_error 
Fail fail when the ps format template is invalid.
 2015-08-05 19:19:33 -04:00
Jessie Frazelle a8e67849b9 Merge pull request #15001 from fmoliveira/master 
Adding support for elementary OS distro in install script.
 2015-08-05 16:14:47 -07:00
John Howard da44d0fccb Windows: Test infrastructure plumbing 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-05 14:34:32 -07:00
Sebastiaan van Stijn 565535073f Merge pull request #15346 from Microsoft/minortypo 
Minor typo in test-and-docs.md
 2015-08-05 22:27:18 +02:00
John Howard 831b00303f Windows: Fix certificate directory for registry 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-05 13:25:41 -07:00
John Howard b5eea8f33b Minor typo in test-and-docs.md 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-05 13:22:39 -07:00
David Calavera 3d3db0d4af 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>
 2015-08-05 13:22:24 -07:00
Alexander Morozov aec46ac0b2 Merge pull request #15336 from Microsoft/fixwindowsci 
Windows: Fix for CI
 2015-08-05 13:11:59 -07:00