@@ -447,7 +447,7 @@ rec {
447447 let
448448 stream = streamLayeredImage args;
449449 in
450− runCommand "${name}.tar.gz" {
450+ runCommand "${baseNameOf name}.tar.gz" {
451451 inherit (stream) imageName;
452452 passthru = { inherit (stream) imageTag; };
453453 nativeBuildInputs = [ pigz ];
@@ -746,8 +746,10 @@ rec {
746746 (lib.assertMsg (maxLayers > 1)
747747 "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})");
748748 let
749+ baseName = baseNameOf name;
750+
749751 streamScript = writePython3 "stream" {} ./stream_layered_image.py;
750− baseJson = writeText "${name}-base.json" (builtins.toJSON {
752+ baseJson = writeText "${baseName}-base.json" (builtins.toJSON {
751753 inherit config;
752754 architecture = defaultArch;
753755 os = "linux";
@@ -759,7 +761,7 @@ rec {
759761 # things like permissions set on 'extraCommands' are not overriden
760762 # by Nix. Then we precompute the sha256 for performance.
761763 customisationLayer = symlinkJoin {
762− name = "${name}-customisation-layer";
764+ name = "${baseName}-customisation-layer";
763765 paths = contentsList;
764766 inherit extraCommands;
765767 postBuild = ''
@@ -788,7 +790,7 @@ rec {
788790 # so they'll be excluded from the created images.
789791 unnecessaryDrvs = [ baseJson overallClosure ];
790792
791− conf = runCommand "${name}-conf.json" {
793+ conf = runCommand "${baseName}-conf.json" {
792794 inherit maxLayers created;
793795 imageName = lib.toLower name;
794796 passthru.imageTag =
@@ -854,7 +856,7 @@ rec {
854856 --arg created "$created" |
855857 tee $out
856858 '';
857− result = runCommand "stream-${name}" {
859+ result = runCommand "stream-${baseName}" {
858860 inherit (conf) imageName;
859861 passthru = {
860862 inherit (conf) imageTag;