commit 926e93be7394e4beb99716010943f68a12de6deb · pyrox.dev/nixpkgs

+10 -1

nixos/tests/docker-tools.nix

···

       90
       90
        
       

     

       91
       91
        
           with subtest("Ensure Docker images can use an unstable date"):

     

       92
       92
        
               docker.succeed(

     

       93
       93
       -
                   "docker load --input='${examples.bash}'"

     

       93
       93
       +
                   "docker load --input='${examples.unstableDate}'"

     

       94
       94
        
               )

     

       95
       95
        
               assert unix_time_second1 not in docker.succeed(

     

       96
       96
        
                   "docker inspect ${examples.unstableDate.imageName} "

     

       97
       97
       +
                   + "| ${pkgs.jq}/bin/jq -r .[].Created"

     

       98
       98
       +
               )

     

       99
       99
       +
       

     

       100
       100
       +
           with subtest("Ensure Layered Docker images can use an unstable date"):

     

       101
       101
       +
               docker.succeed(

     

       102
       102
       +
                   "docker load --input='${examples.unstableDateLayered}'"

     

       103
       103
       +
               )

     

       104
       104
       +
               assert unix_time_second1 not in docker.succeed(

     

       105
       105
       +
                   "docker inspect ${examples.unstableDateLayered.imageName} "

     

       97
       106
        
                   + "| ${pkgs.jq}/bin/jq -r .[].Created"

     

       98
       107
        
               )

     

       99
       108

+10

pkgs/build-support/docker/examples.nix

···

       354
       354
        
             Env = [ "USER=root" ];

     

       355
       355
        
           };

     

       356
       356
        
         };

     

       357
       357
       +
       

     

       358
       358
       +
         # 20. Ensure that setting created to now results in a date which

     

       359
       359
       +
         # isn't the epoch + 1 for layered images.

     

       360
       360
       +
         unstableDateLayered = pkgs.dockerTools.buildLayeredImage {

     

       361
       361
       +
           name = "unstable-date-layered";

     

       362
       362
       +
           tag = "latest";

     

       363
       363
       +
           contents = [ pkgs.coreutils ];

     

       364
       364
       +
           created = "now";

     

       365
       365
       +
         };

     

       366
       366
       +
       

     

       357
       367
        
       }

+3 -3

pkgs/build-support/docker/stream_layered_image.py

···

       41
       41
        
       import tarfile

     

       42
       42
        
       import itertools

     

       43
       43
        
       import threading

     

       44
       44
       -
       from datetime import datetime

     

       44
       44
       +
       from datetime import datetime, timezone

     

       45
       45
        
       from collections import namedtuple

     

       46
       46
        
       

     

       47
       47
        
       

     
···

       242
       242
        
               conf = json.load(f)

     

       243
       243
        
       

     

       244
       244
        
           created = (

     

       245
       245
       -
             datetime.now(tz=datetime.timezone.utc)

     

       245
       245
       +
             datetime.now(tz=timezone.utc)

     

       246
       246
        
             if conf["created"] == "now"

     

       247
       247
        
             else datetime.fromisoformat(conf["created"])

     

       248
       248
        
           )

     
···

       280
       280
        
                   },

     

       281
       281
        
                   "history": [

     

       282
       282
        
                       {

     

       283
       283
       -
                         "created": conf["created"],

     

       283
       283
       +
                         "created": datetime.isoformat(created),

     

       284
       284
        
                         "comment": f"store paths: {layer.paths}"

     

       285
       285
        
                       }

     

       286
       286
        
                       for layer in layers