@@ -537,14 +537,19 @@ rec {
537537 buildInputs = [ jshon pigz coreutils findutils jq ];
538538 # Image name and tag must be lowercase
539539 imageName = lib.toLower name;
540− imageTag = if tag == null then "" else lib.toLower tag;
541540 baseJson = configJson;
541+ passthru.imageTag =
542+ if tag == null
543+ then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result)))
544+ else lib.toLower tag;
542545 } ''
543− ${lib.optionalString (tag == null) ''
546+ ${if (tag == null) then ''
544547 outName="$(basename "$out")"
545548 outHash=$(echo "$outName" | cut -d - -f 1)
546549
547550 imageTag=$outHash
551+ '' else ''
552+ imageTag="${tag}"
548553 ''}
549554
550555 find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list