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
This commit is contained in:
committed by
Jaka Hudoklin
parent
88a8b004c6
commit
9bc1676e5a
@@ -3,24 +3,21 @@ btrfsProgs, iptables, bash}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "docker-${version}";
|
||||
version = "0.10.0";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
|
||||
sha256 = "14gmx119hd3j0c6rbks2mm83hk46s5wnnyvj8rhn25h0yp39pm5q";
|
||||
sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy";
|
||||
};
|
||||
|
||||
phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs ./hack
|
||||
'';
|
||||
dontStrip = true;
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs ./hack
|
||||
export AUTO_GOPATH=1
|
||||
export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5"
|
||||
export DOCKER_GITCOMMIT="d84a070"
|
||||
./hack/make.sh dynbinary
|
||||
'';
|
||||
|
||||
@@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.docker.io/;
|
||||
description = "An open source project to pack, ship and run any application as a lightweight container";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline ];
|
||||
maintainers = with maintainers; [ offline tailhook ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user