public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker: add buildx support to docker client

Browse Source
This commit is contained in:
Ivan Babrou 2020-12-22 14:53:53 -08:00
parent e431ff7e2e
commit deb0d298a2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/virtualization/docker/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage { stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage
, makeWrapper, installShellFiles, pkg-config , makeWrapper, installShellFiles, pkg-config
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, lvm2, systemd , sqlite, iproute, lvm2, systemd, docker-buildx
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
, procps, libseccomp , procps, libseccomp
, nixosTests , nixosTests
, buildxSupport ? false
}: }:
with lib; with lib;
@ -15,7 +16,7 @@ rec {
, mobyRev, mobySha256 , mobyRev, mobySha256
, runcRev, runcSha256 , runcRev, runcSha256
, containerdRev, containerdSha256 , containerdRev, containerdSha256
, tiniRev, tiniSha256 , tiniRev, tiniSha256, buildxSupport
} : } :
let let
docker-runc = runc.overrideAttrs (oldAttrs: { docker-runc = runc.overrideAttrs (oldAttrs: {
@ -142,7 +143,7 @@ rec {
makeWrapper makeWrapper
] ++ optionals (stdenv.isLinux) [ ] ++ optionals (stdenv.isLinux) [
sqlite lvm2 btrfs-progs systemd libseccomp sqlite lvm2 btrfs-progs systemd libseccomp
]; ] ++ optionals (buildxSupport) [ docker-buildx ];
# Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
buildPhase = '' buildPhase = ''
@ -167,6 +168,9 @@ rec {
substituteInPlace ./scripts/build/.variables --replace "set -eu" "" substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man" substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man
'' + optionalString buildxSupport ''
substituteInPlace ./components/cli/cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
''; '';
outputs = ["out" "man"]; outputs = ["out" "man"];
@ -224,5 +228,6 @@ rec {
containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
inherit buildxSupport;
}; };
} }