summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2021-03-11 14:58:26 -0500
committerGitHub <noreply@github.com>2021-03-11 14:58:26 -0500
commit17a9f368e3519041a360285ce7a845ee36623b7d (patch)
treeb73976f9a1d3672051da26eb789e472122a94af5 /nixos
parentf707104092b2dc70b364297826fffeed4c3968cc (diff)
parent419a4fa596577667271fcfc057bc9063ddbffe47 (diff)
Merge pull request #115793 from lbpdt/feature/docker-tools-layered-image-name-slashes
dockerTools.buildLayeredImage: image names with registry/ prefix
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/docker-tools.nix16
1 files changed, 16 insertions, 0 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 6638ec4927ce..1cc554d002b2 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -254,5 +254,21 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
"docker rmi ${examples.layeredStoreSymlink.imageName}",
)
+
+ with subtest("buildImage supports registry/ prefix in image name"):
+ docker.succeed(
+ "docker load --input='${examples.prefixedImage}'"
+ )
+ docker.succeed(
+ "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedImage.imageName}'"
+ )
+
+ with subtest("buildLayeredImage supports registry/ prefix in image name"):
+ docker.succeed(
+ "docker load --input='${examples.prefixedLayeredImage}'"
+ )
+ docker.succeed(
+ "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedLayeredImage.imageName}'"
+ )
'';
})