diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-09-27 14:16:23 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-09-27 14:19:43 -0400 |
| commit | fb2d153dac13f37e2b71811aa8600f99b758a73e (patch) | |
| tree | 3b9b3d643bc92faeae085c4a6c421195424d1625 | |
| parent | d1e46df24bae37d69e6eda09bee933f22acbe0ce (diff) | |
| download | nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.tar nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.tar.gz nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.tar.bz2 nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.tar.lz nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.tar.xz nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.tar.zst nixpkgs-fb2d153dac13f37e2b71811aa8600f99b758a73e.zip | |
dockerTools: test buildLayeredImage
| -rw-r--r-- | nixos/tests/docker-tools.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 5a7590cbf36..360b32faae7 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -58,5 +58,9 @@ import ./make-test.nix ({ pkgs, ... }: { # Ensure Docker images can use an unstable date $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]"); + + # Ensure Layered Docker images work + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-image}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName}"); ''; }) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 822e0dbb31f..003e7429a81 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -150,4 +150,11 @@ rec { contents = [ pkgs.coreutils ]; created = "now"; }; + + # 10. Create a layered image + layered-image = pkgs.dockerTools.buildLayeredImage { + name = "layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + }; } |