Commit Graph

41 Commits

Author SHA1 Message Date
obadz
f0de1c75b5 docker: fix build with systemd 230 2016-05-27 15:42:15 +01:00
Nathan Zadoks
99177c7377 docker: remove enableLxc parameter
LXC support was removed in Docker 1.4 (November 2015), and isn't coming
back.
2016-05-24 11:08:20 -04:00
Nathan Zadoks
ebdd600732 docker: allow disabling btrfs and devicemapper 2016-04-17 00:41:17 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Pierre Dal-Pra
d97805ccd0 docker: 1.10.0 -> 1.10.3 2016-03-18 22:12:42 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Cole Mickens
712eb6b7e0 docker 1.9.1 -> 1.10.0 2016-02-04 22:52:06 -08:00
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Nathan Zadoks
9c9a5353f9 docker: enable journald support 2016-01-14 16:01:19 +01:00
Tobias Geerinckx-Rice
82419575aa btrfsProgs -> canonical btrfs-progs 2016-01-03 20:38:44 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Nathan Zadoks
d5e5a7dbc3 docker: 1.9.0 -> 1.9.1 2015-12-21 12:18:22 +01:00
Luca Bruno
2f0fe05543 docker: use glibc.static with multiple-outputs for dockerinit 2015-12-10 13:19:25 +01:00
Jaka Hudoklin
8f806d88bf Merge pull request #11057 from offlinehacker/pkgs/docker-gc/add
docker-gc: init at b0cc52aa3da2e2ac0080794e0be6e674b1f063fc
2015-11-18 22:28:18 +01:00
Jaka Hudoklin
7f45af89f7 Merge pull request #11063 from offlinehacker/pkgs/docker/update_1.9.0
docker: 1.8.1 -> 1.9.0
2015-11-18 22:26:17 +01:00
Jaka Hudoklin
02fc10ce25 docker: make lxc optional 2015-11-16 16:17:53 +01:00
Jaka Hudoklin
c79e22edbf docker: 1.8.1 -> 1.9.0 2015-11-16 15:56:09 +01:00
Jaka Hudoklin
a42d2e439b docker-gc: init at b0cc52aa3da2e2ac0080794e0be6e674b1f063fc 2015-11-16 15:16:48 +01:00
Jaka Hudoklin
95e2403f86 Merge pull request #9530 from offlinehacker/pkgs/docker/fix_add_utillinux
docker: add blkid from utillinux to path
2015-08-29 18:32:52 +02:00
Jaka Hudoklin
ff0575a2f1 docker: add blkid from utillinux to path 2015-08-29 18:25:39 +02:00
Domen Kožar
e65fce3af6 docker: fix build on i686 2015-08-27 13:22:29 +02:00
Domen Kožar
c2841a2221 docker: 1.7 -> 1.8.1, fix build (go 1.4) 2015-08-26 13:56:18 +02:00
Benjamin Staffin
a5cdd98da4 docker: 1.6.0 -> 1.7.1 2015-08-03 20:20:56 -07:00
Domen Kožar
f550eb7fde docker: fix build 2015-05-10 12:41:21 +02:00
Jaka Hudoklin
eee1bb5ae5 docker: update to 1.6.0 2015-04-25 15:46:35 +02:00
Jaka Hudoklin
6944b2bde7 docker: update to 1.5.0 2015-02-27 13:53:38 +01:00
Bjørn Forsman
97875ac175 bridge-utils: align attrname with pkgname 2015-02-20 22:30:51 +01:00
codyopel
6d3fee045a docker: fix shebangs, closes #6368 2015-02-16 21:41:46 -05:00
Brian McKenna
a26b8bcb5d Upgrade to Docker 1.4 2015-01-20 19:49:10 -07:00
Rob Vermaas
90c3dc79c5 docker: update from 1.3.1 to 1.3.3, potentially fixes CVE-2014-6407, CVE-2014-6408 2014-12-17 15:47:56 +01:00
Rob Vermaas
f54c852a36 docker: update from 1.3.0 to 1.3.1, potentially fixes CVE-2014-5277 2014-11-18 16:06:36 +01:00
Paul Colomiets
f86967ac8a docker: upgrade to 1.3.0 2014-10-17 23:20:09 +03:00
Jaka Hudoklin
0c398f6040 docker: add xz to PATH, make importing from archives work 2014-09-04 01:30:59 +02:00
Jaka Hudoklin
e5194e5aea docker: fix docker not finding dockerinit 2014-09-03 18:24:51 +02:00
Jaka Hudoklin
88391a5c65 docker: update to 1.2.0 2014-08-24 17:30:50 +02:00
Georges Dubus
a82e9e4b5c Added e2fsprogs to docker dependencies.
Otherwise, it complains about mkfs.ext4 not being present at service
start (and stops).
2014-08-19 11:00:46 +02:00
Paul Colomiets
9bc1676e5a Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
2014-07-28 21:45:49 +02:00
Alex Berg
47090c9bdc Bump docker version to 0.10.0. 2014-05-03 17:03:33 +02:00
Alex Berg
7dff8a8aaf Bump Docker to v0.9.1. Tested pulling, committing, pushing.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 15:08:07 -05:00
Jaka Hudoklin
cc33c351b8 Add docker 2014-01-27 00:56:51 +01:00