diff options
author | lewo <lewo@abesis.fr> | 2019-03-28 16:25:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-28 16:25:01 +0100 |
commit | dc3ed336df6b14a70e248269672459b499d9bdee (patch) | |
tree | 46d1b6065c051ab1f71d2d6aaecb6378b0c964d4 /pkgs/build-support/docker/default.nix | |
parent | 88b32b2004db983bdc4004d60c452c660b4f64f4 (diff) | |
parent | 468df177c4f01bce239da426710484fbc7b5a89d (diff) | |
download | nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.tar nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.tar.gz nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.tar.bz2 nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.tar.lz nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.tar.xz nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.tar.zst nixpkgs-dc3ed336df6b14a70e248269672459b499d9bdee.zip |
Merge pull request #58345 from xtruder/pkgs/dockerTools/pullImage/finalImageName
dockerTools: add finalImageName parameter for pullImage
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 3ac376e267e..344f1abc8b2 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" ''; |