mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Bump Docker to v0.9.1. Tested pulling, committing, pushing.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
parent
8cd95471d7
commit
7dff8a8aaf
@ -1,36 +1,33 @@
|
||||
{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, iptables, lvm2
|
||||
, bash}:
|
||||
{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
|
||||
btrfsProgs, iptables, bash}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "docker-${version}";
|
||||
version = "0.7.6";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
|
||||
sha256 = "0anlzba2vm1fs5nf0dl2svrgj3ddsbl5iyhsm8vfbi3f23vppkfv";
|
||||
sha256 = "0m4s21dxd1bj08xrmi7iw77djj3cpxvjsin12p6v6v1qnigm18ww";
|
||||
};
|
||||
|
||||
phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ makeWrapper go sqlite lxc iproute lvm2 iptables ];
|
||||
buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs ./hack
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p src/github.com/dotcloud
|
||||
ln -sn "../../../" "src/github.com/dotcloud/docker"
|
||||
export GOPATH="$(pwd):$(pwd)/vendor"
|
||||
export DOCKER_GITCOMMIT="bc3b2ec0622f50879ae96f042056b6bd2e0b4fba"
|
||||
export DOCKER_INITPATH="$out/libexec/docker/dockerinit"
|
||||
export AUTO_GOPATH=1
|
||||
export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5"
|
||||
./hack/make.sh dynbinary
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
|
||||
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
|
||||
wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:${lvm2}:sbin:${lxc}/bin:${iptables}/sbin"
|
||||
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit
|
||||
wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin"
|
||||
|
||||
# systemd
|
||||
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
|
||||
|
Loading…
Reference in New Issue
Block a user