From 7bf0d1cbaf5a54b99cbb1497a0b78c4496b8fabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 18 Apr 2020 21:27:14 +0200 Subject: [PATCH 1/5] docker: add git to extraPath When building a docker container from git, docker was missing the git binary in $PATH. (cherry picked from commit 08d83c16416abecef6adcc051f3536076e133f64) --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7f7b3a227e84..f3054cd8691a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd -, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs +, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git , procps, libseccomp }: @@ -123,7 +123,7 @@ rec { outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); installPhase = optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd From 52cc587778404999771597af7893337cbafbde80 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 10 May 2020 11:24:03 +1000 Subject: [PATCH 2/5] docker: use installShellFiles (cherry picked from commit 764dd5c875fa225b554e613aaca7fb93c1920a0d) --- .../virtualization/docker/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f3054cd8691a..664abc0360c4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -78,7 +78,7 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ installShellFiles pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ @@ -147,9 +147,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # completion (cli) - install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + installShellCompletion --bash ./components/cli/contrib/completion/bash/docker + installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish + installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) # Generate man pages from cobra commands @@ -163,16 +163,7 @@ rec { echo "Generate legacy manpages" ./man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in ./man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" - done - done + installManPage man/*/*.[1-9] ''; preFixup = '' From 1e1b0acd28176ba479385c7f4ee974576441f978 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 20 May 2020 10:52:10 -0700 Subject: [PATCH 3/5] docker: 19.03.8 -> 19.03.9 (cherry picked from commit fb3039d91b7c59fadd519524244d605859ecd8b3) --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 664abc0360c4..b36b358b2aac 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -197,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.8"; - rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3"; - sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j"; + version = "19.03.9"; + rev = "9d988398e765e4b97f27f93c4d04b272ac64c9c7"; + sha256 = "0g2jpmqryfpvhdkapl8syi4hccx6czpihp1p1gsp1mfwz9aycsqv"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 From 33973b7fc017edd02d3da3d5852eb6e5d3e78dd6 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 29 May 2020 11:08:03 -0700 Subject: [PATCH 4/5] docker: 19.03.9 -> 19.03.10 (cherry picked from commit c8dddcb1a9f7b2e2c99477ddd778599b5e7493b4) --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b36b358b2aac..4f163fa1f071 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -197,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.9"; - rev = "9d988398e765e4b97f27f93c4d04b272ac64c9c7"; - sha256 = "0g2jpmqryfpvhdkapl8syi4hccx6czpihp1p1gsp1mfwz9aycsqv"; + version = "19.03.10"; + rev = "9424aeaee927a5ddd19ee10702159cd91cc3f48e"; + sha256 = "1nbx29xkdxmfrrmf77k9n68rmrp5x40wqhhh5w9p0nk75s62iawk"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 From 4aad3f54228959c05f9a2cd4faf553d8b455eec3 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Mon, 1 Jun 2020 08:44:02 -0700 Subject: [PATCH 5/5] docker: 19.03.10 -> 19.03.11 (cherry picked from commit a4ea8abae6a2a679daf4c76f211713a11ac460c0) --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4f163fa1f071..2ab5ef5c9a6e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -197,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.10"; - rev = "9424aeaee927a5ddd19ee10702159cd91cc3f48e"; - sha256 = "1nbx29xkdxmfrrmf77k9n68rmrp5x40wqhhh5w9p0nk75s62iawk"; + version = "19.03.11"; + rev = "42e35e61f352e527082521280d5ea3761f0dee50"; + sha256 = "0q4l4z2bg269hj1dqaq02f84zgp3p8idw1cxczw383cjl0ra8xgq"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13