diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
| commit | 3fe32b675e1605cbc830fa52c0593747fa4dd7e2 (patch) | |
| tree | e0b31e2df8f0734290232b1b0d61d0716731e296 /pkgs/build-support/docker | |
| parent | a903c60c627f42461d3e6f9780d26a80f8e51470 (diff) | |
| parent | b7d4a356be49501ea046b28db28dc2807f5fccdb (diff) | |
| download | nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.gz nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.bz2 nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.lz nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.xz nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.zst nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6de38821baf..372c567a7e7 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -551,14 +551,19 @@ rec { buildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; - imageTag = if tag == null then "" else lib.toLower tag; baseJson = configJson; + passthru.imageTag = + if tag == null + then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result))) + else lib.toLower tag; } '' - ${lib.optionalString (tag == null) '' + ${if (tag == null) then '' outName="$(basename "$out")" outHash=$(echo "$outName" | cut -d - -f 1) imageTag=$outHash + '' else '' + imageTag="${tag}" ''} find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list |