clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-19 12:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,775 Commits 9 Branches 112 Tags
b60e316b67b5d1b6cff72de26d55ac430d15134c
Commit Graph

6775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby b60e316b67 Only unshare the mount namespace for execin 
Fixes #4728
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Conflicts:
	pkg/libcontainer/nsinit/execin.go:
	  ns.logger.Println("unshare namespaces")' was removed already
 2014-03-24 23:47:31 +02:00
unclejack a2fc45e627 retry to retrieve metadata on failure during pull 
This makes Docker retry to retrieve the JSON metadata for the layers.
Docker will make 5 attempts to retrieve the metadata before failing and
it will increase the delay between attempts after each failed attempt.

This is a backport of PR #4387. The following changes had to be made:
-				img     *image.Image
+				img     *Image

-				img, err = image.NewImgJSON(imgJSON)
+				img, err = NewImgJSON(imgJSON)

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-24 23:47:31 +02:00
Tianon Gravi 3f47f23fec Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-19 22:49:49 -06:00
Sven Dowideit e5974ae0ff missed a bug 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-03-19 18:19:57 -06:00
Sven Dowideit ce002bf8da whitespace-blind 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-19 17:39:13 -06:00
Sven Dowideit 9cad4c2a1b Generate md5 and sha265 hashes when building, and upload them in hack/release.sh 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-19 17:39:06 -06:00
unclejack 6056cce265 Merge pull request #4745 from unclejack/prepare_for_bump_v0.9.1 
Prepare for bump v0.9.1
 2014-03-19 20:00:55 +02:00
Guillaume J. Charmes cec512ccbb Make docker use the signal pkg with strings 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-18 20:29:37 +02:00
Guillaume J. Charmes d1e027291b Create portable signalMap 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-18 20:29:24 +02:00
Guillaume J. Charmes fda2934b6d Move signal to pkg 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-18 20:29:10 +02:00
Alexander Larsson 6fe06c6cc8 devmapper: Increase timeout in waitClose to 10sec 
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-18 19:15:44 +02:00
Alexander Larsson 63596f8c5d DeviceMapper: Succeed immediately when removing non-existant devices 
We've seen situations where removal of "ID-init" failed during
container deletion (EBUSY), after removal of "ID" has succeeded. This
caused the container delete operation to fail, and on the next delete
attempt the removal of "ID" failed immediately with "does not exist".

Ideally we should not fail the ID-init removal, but its also non-ideal
to allow a state where the container is half-removed and we cannot
make progress deleting the container. So, we silently ignore not-exist
errors on device removal.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-18 18:57:31 +02:00
Vladimir Rutsky 3c9e23c297 Fix external link on security of containers 
Docker-DCO-1.1-Signed-off-by: Vladimir Rutsky <altsysrq@gmail.com> (github: rutsky)
 2014-03-18 18:08:59 +02:00
Victor Vieux 6908e0ba1e fix content-type detection in docker cp 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-18 18:08:03 +02:00
Wes Morgan 816d55342d merge existing config when committing 
Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
 2014-03-18 18:04:58 +02:00
Victor Vieux 2463be4dea fix panic in monitor 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-18 17:04:56 +02:00
Isabel Jimenez 9e98ba72e1 adding configuration for timeout and disable it by default 
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
 2014-03-18 17:04:21 +02:00
Timothy Hobbs d1f7ebda16 Refactor out interface specific information from execdriver.Network 
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
 2014-03-18 16:52:57 +02:00
Timothy Hobbs 899f06bf79 Fix issue #4681 - No loopback interface within container when networking is disabled. 
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Remove loopback code from veth strategy

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Use append when building network strategy list

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Swap loopback and veth strategies in Networks list

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Revert "Swap loopback and veth strategies in Networks list"

This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

When initializing networks, only return from the loop if there is an error

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
 2014-03-18 16:52:46 +02:00
Timothy Hobbs f020f1d31e Add failing test case for issue #4681 
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
 2014-03-18 16:52:28 +02:00
Michael Crosby b9a0e886fc Send sigterm to child instead of sigkill 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-18 16:51:34 +02:00
Guillaume J. Charmes bcab23bbdc Have the exec driver and kernel version in non-debug mode in docker info 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-18 16:50:55 +02:00
Victor Vieux 7c35bfd78e as you could have multiple messages per line with streams, don't \r 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-18 16:50:19 +02:00
Michael Crosby 78d66068a5 Always symlink /dev/ptmx for libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-18 16:48:57 +02:00
Guillaume J. Charmes ab5b715964 Fix issue when /etc/apparmor.d does not exists 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-18 16:45:25 +02:00
unclejack d8448f27c6 don't leave empty cidFile behind 
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-18 16:42:25 +02:00
Victor Vieux 463cf28788 improve deprecation message 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-18 16:37:26 +02:00
Guillaume J. Charmes 6ce9daea0e Fix attach exit on darwin 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-18 16:35:48 +02:00
Alexander Larsson 39dbaa08dc devmapper: Increase sleep times and unlock while sleeping 
We've seen some cases in the wild where waiting for unmount/deactivate
of devmapper devices taking a long time (several seconds). So, we increase
the sleeps to 10 seconds before we timeout. For instance:

https://github.com/dotcloud/docker/issues/4389

But, in order to not keep other processes blocked we unlock the global
dm lock while waiting to allow other devices to continue working.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-18 16:30:53 +02:00
Alexander Larsson d70e20cddd devmapper: Add per-device lock 
We currently use a global lock to protect global data (like the
Devices map) as well as device data itself and access to
(non-threadsafe) libdevmapper.

This commit also adds a per-device lock, which will allow per-device
operations to temporarily release the global lock while e.g. waiting.
The per-device lock will make sure that nothing else accesses that
device while we're operating on it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-18 16:30:28 +02:00
Tianon Gravi 2741b82cf3 Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-11 23:47:15 -06:00
Tianon Gravi 70ec7c6355 Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-11 23:47:10 -06:00
Guillaume J. Charmes 0225a37951 Update parseLxcInfo to comply with new lxc1.0 format 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-11 23:46:43 -06:00
Guillaume J. Charmes 4bb1950089 Remove goroutine leak upon error 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-11 23:46:36 -06:00
Michael Crosby 143c9707a9 Merge pull request #4489 from crosbymichael/bump_v0.9.0 
Bump to version 0.9.0
 2014-03-10 10:04:33 -07:00
Tianon Gravi 2b3fdf2344 Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
v0.9.0 		2014-03-10 09:57:10 -07:00
Michael Crosby 0ab7b6952a Bump to version 0.9.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-07 15:38:10 -08:00
Michael Crosby ccdf27e502 Merge branch 'master' into bump_v0.9.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-07 15:37:29 -08:00
Michael Crosby d8425d98e6 Merge pull request #4534 from creack/fix_race_kill 
Fix Race when killing the daemon
 2014-03-07 18:11:51 -05:00
Sven Dowideit 65283afc8b Merge pull request #4524 from gurjeet/patch-3 
Correct typo
 2014-03-08 08:43:16 +10:00
Guillaume J. Charmes b845ff355a Fix Race when killing the daemon 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-03-07 11:51:28 -08:00
Victor Vieux 27eae50224 Merge pull request #4529 from pmorie/typo 
Fix typo in devmapper driver_test
 2014-03-07 11:01:04 -08:00
Guillaume J. Charmes f27ad07139 Merge pull request #4516 from tianon/fix-static-dockerinit 
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
 2014-03-07 10:15:49 -08:00
Guillaume J. Charmes 5b0ca89e2a Merge pull request #4519 from crosbymichael/back-to-pivot-root 
Use env var to toggle pivot root or ms_move
 2014-03-07 10:12:00 -08:00
Paul Morie b3e7df48df Fix typo in devmapper driver_test 
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
 2014-03-07 12:20:25 -05:00
Gurjeet Singh 6d9a7d6bc3 Correct typo 2014-03-07 08:45:08 -05:00
Sven Dowideit 3e5102c11e Merge pull request #4522 from liubin0329/patch-1 
removing redundant dot
 2014-03-07 23:20:02 +10:00
bin liu 29079f03cf removing redundant dot 
Maybe it's a typo
 2014-03-07 18:19:18 +08:00
Tianon Gravi a40bb2aabc Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-06 21:22:25 -07:00
Michael Crosby 36dd124b16 Add env var to toggle pivot root or ms_move 
Use the  DOCKER_RAMDISK env var to tell the native driver not to use
a pivot root when setting up the rootfs of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-06 19:30:52 -08:00