commit 5540dd9b9ba6ebad454c2b3d0d31557b9521378e · pyrox.dev/nixpkgs

+7

nixos/tests/docker-tools.nix

···

       247
       247
        
                   ).strip()

     

       248
       248
        
                   == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}"

     

       249
       249
        
               )

     

       250
       250
       +
       

     

       251
       251
       +
           with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"):

     

       252
       252
       +
               docker.succeed(

     

       253
       253
       +
                   "docker load --input='${examples.layeredStoreSymlink}'",

     

       254
       254
       +
                   "docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",

     

       255
       255
       +
                   "docker rmi ${examples.layeredStoreSymlink.imageName}",

     

       256
       256
       +
               )

     

       250
       257
        
         '';

     

       251
       258
        
       })

+11

pkgs/build-support/docker/examples.nix

···

       416
       416
        
           contents = crossPkgs.hello;

     

       417
       417
        
         };

     

       418
       418
        
       

     

       419
       419
       +
         # layered image where a store path is itself a symlink

     

       420
       420
       +
         layeredStoreSymlink =

     

       421
       421
       +
         let

     

       422
       422
       +
           target = pkgs.writeTextDir "dir/target" "Content doesn't matter.";

     

       423
       423
       +
           symlink = pkgs.runCommandNoCC "symlink" {} "ln -s ${target} $out";

     

       424
       424
       +
         in

     

       425
       425
       +
           pkgs.dockerTools.buildLayeredImage {

     

       426
       426
       +
             name = "layeredstoresymlink";

     

       427
       427
       +
             tag = "latest";

     

       428
       428
       +
             contents = [ pkgs.bash symlink ];

     

       429
       429
       +
           } // { passthru = { inherit symlink; }; };

     

       419
       430
        
       }

+5 -1

pkgs/build-support/docker/stream_layered_image.py

···

       83
       83
        
       

     

       84
       84
        
               for path in paths:

     

       85
       85
        
                   path = pathlib.Path(path)

     

       86
       86
       -
                   files = itertools.chain([path], path.rglob("*"))

     

       86
       86
       +
                   if path.is_symlink():

     

       87
       87
       +
                       files = [path]

     

       88
       88
       +
                   else:

     

       89
       89
       +
                       files = itertools.chain([path], path.rglob("*"))

     

       90
       90
       +
       

     

       87
       91
        
                   for filename in sorted(files):

     

       88
       92
        
                       ti = append_root(tar.gettarinfo(filename))

     

       89
       93