13 commits

Author	SHA1	Message	Date
Tianon Gravi	7fd6dcc831	Add stubbed and commented "/etc/default/docker" to our deb package ... This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.	2014-01-01 22:34:22 -07:00
Tianon Gravi	cda146547e	Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0" ... Fixes #3372	2013-12-28 06:35:00 -07:00
Tianon Gravi	e01732f857	Revert "Add cgroup-bin dependency to our Ubuntu package" ... This reverts commit c81bb20f5b. After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations." Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces. The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.	2013-12-06 14:15:40 -08:00
Victor Vieux	c764fb0c29	Merge pull request #3006 from tianon/ubuntu-cgroup-bin ... Add cgroup-bin dependency to our Ubuntu package	2013-12-05 16:41:01 -08:00
Tianon Gravi	c81bb20f5b	Add cgroup-bin dependency to our Ubuntu package ... Since cgroup-bin is only "recommended" by the lxc package on Ubuntu, but is necessary for having the proper cgroups mounted for Docker to function, this makes some sense for us to add separately. Fixes #2990	2013-12-02 16:02:54 -07:00
Tianon Gravi	3ac76cfeff	Update bundlescript shebangs to be bash, reflecting how they're actually invoked	2013-12-02 15:48:39 -07:00
Tianon Gravi	498b6031b1	Update ubuntu packaging script, especially to stop docker group deletion	2013-11-08 17:23:37 -07:00
Tianon Gravi	fb8d488896	Add a few small consistency tweaks in hack	2013-10-25 15:13:25 -07:00
Tianon Gravi	2aaaf90320	Update hack/make/ubuntu to make less ubuntu-centric packages, to fix the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables	2013-10-23 07:38:12 -06:00
David Sissitka	c22e377a6d	Used tabs for alignment when I should've used spaces. Fixed.	2013-09-26 13:56:59 -07:00
David Sissitka	f8c9f11f06	Configured FPM to make /etc/init/docker.conf a config file.	2013-09-26 12:52:43 -07:00
Daniel Mizyrycki	dfd0deefbb	packaging, issue #1647: Add docker groupname on the package release	2013-09-16 23:00:54 -07:00
Solomon Hykes	3d39336a46	Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.	2013-09-09 18:45:40 -07:00