diff options
| author | Jaka Hudoklin <jaka@gatehub.net> | 2019-03-26 10:35:21 +0100 |
|---|---|---|
| committer | Jaka Hudoklin <jaka@gatehub.net> | 2019-03-26 19:35:14 +0100 |
| commit | 468df177c4f01bce239da426710484fbc7b5a89d (patch) | |
| tree | af590b97a67010b7c99f768817c71bd19ec85f6d /pkgs/build-support/docker | |
| parent | c10bc73988d520b8a6c3051a58583f2d73c95e99 (diff) | |
| download | nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.tar nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.tar.gz nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.tar.bz2 nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.tar.lz nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.tar.xz nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.tar.zst nixpkgs-468df177c4f01bce239da426710484fbc7b5a89d.zip | |
dockerTools: add finalImageName parameter for pullImage
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6efb447e142..ef93c97fd4d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -45,13 +45,18 @@ rec { , sha256 , os ? "linux" , arch ? "amd64" + + # This is used to set name to the pulled image + , finalImageName ? imageName # This used to set a tag to the pulled image , finalImageTag ? "latest" - , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar" + + , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar" }: runCommand name { - inherit imageName imageDigest; + inherit imageDigest; + imageName = finalImageName; imageTag = finalImageTag; impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; outputHashMode = "flat"; @@ -62,7 +67,7 @@ rec { SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt"; sourceURL = "docker://${imageName}@${imageDigest}"; - destNameTag = "${imageName}:${finalImageTag}"; + destNameTag = "${finalImageName}:${finalImageTag}"; } '' skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 8a1b35f02d9..557a4dbf54b 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -88,8 +88,9 @@ rec { nixFromDockerHub = pullImage { imageName = "nixos/nix"; imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357"; - sha256 = "0vnp3mhpk4ny3xa3cgngqsargnmvfgld54d5sn4b5av6yqzzp67z"; + sha256 = "07q9y9r7fsd18sy95ybrvclpkhlal12d30ybnf089hq7v1hgxbi7"; finalImageTag = "2.2.1"; + finalImageName = "nix"; }; # 5. example of multiple contents, emacs and vi happily coexisting |