git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92934 from hercules-ci/dockerTools-set-imageTag

dockerTools: Always set imageTag attribute

commitc1908bf802846be5342bc340706819e7adc8dded authorRobert Hensing <roberth@users.noreply.github.com> dateThu 16 Jul 2020, 17:05 (6 years ago) parent5e1d1418c0459f
3 files changed+67
nixos/tests/docker-tools.nix+37 pkgs/build-support/docker/default.nix+12 pkgs/build-support/docker/examples.nix+18
nixos/tests/docker-tools.nix+37
@@ -30,8 +30,45 @@ import ./make-test-python.nix ({ pkgs, ... }: {
3030 )
3131
3232 docker.succeed("docker run --rm ${examples.bash.imageName} bash --version")
33+ # Check imageTag attribute matches image
34+ docker.succeed("docker images --format '{{.Tag}}' | grep -F '${examples.bash.imageTag}'")
3335 docker.succeed("docker rmi ${examples.bash.imageName}")
3436
37+ # The remaining combinations
38+ with subtest("Ensure imageTag attribute matches image"):
39+ docker.succeed(
40+ "docker load --input='${examples.bashNoTag}'"
41+ )
42+ docker.succeed(
43+ "docker images --format '{{.Tag}}' | grep -F '${examples.bashNoTag.imageTag}'"
44+ )
45+ docker.succeed("docker rmi ${examples.bashNoTag.imageName}:${examples.bashNoTag.imageTag}")
46+
47+ docker.succeed(
48+ "docker load --input='${examples.bashNoTagLayered}'"
49+ )
50+ docker.succeed(
51+ "docker images --format '{{.Tag}}' | grep -F '${examples.bashNoTagLayered.imageTag}'"
52+ )
53+ docker.succeed("docker rmi ${examples.bashNoTagLayered.imageName}:${examples.bashNoTagLayered.imageTag}")
54+
55+ docker.succeed(
56+ "${examples.bashNoTagStreamLayered} | docker load"
57+ )
58+ docker.succeed(
59+ "docker images --format '{{.Tag}}' | grep -F '${examples.bashNoTagStreamLayered.imageTag}'"
60+ )
61+ docker.succeed(
62+ "docker rmi ${examples.bashNoTagStreamLayered.imageName}:${examples.bashNoTagStreamLayered.imageTag}"
63+ )
64+
65+ docker.succeed(
66+ "docker load --input='${examples.nixLayered}'"
67+ )
68+ docker.succeed("docker images --format '{{.Tag}}' | grep -F '${examples.nixLayered.imageTag}'")
69+ docker.succeed("docker rmi ${examples.nixLayered.imageName}")
70+
71+
3572 with subtest(
3673 "Check if the nix store is correctly initialized by listing "
3774 "dependencies of the installed Nix binary"
pkgs/build-support/docker/default.nix+12
@@ -442,6 +442,7 @@ rec {
442442 in
443443 runCommand "${name}.tar.gz" {
444444 inherit (stream) imageName;
445+ passthru = { inherit (stream) imageTag; };
445446 buildInputs = [ pigz ];
446447 } "${stream} | pigz -nT > $out";
447448
@@ -517,6 +518,11 @@ rec {
517518 layerClosure = writeReferencesToFile layer;
518519 passthru.buildArgs = args;
519520 passthru.layer = layer;
521+ passthru.imageTag =
522+ if tag != null
523+ then lib.toLower tag
524+ else
525+ lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
520526 # Docker can't be made to run darwin binaries
521527 meta.badPlatforms = lib.platforms.darwin;
522528 } ''
@@ -737,6 +743,11 @@ rec {
737743 conf = runCommand "${name}-conf.json" {
738744 inherit maxLayers created;
739745 imageName = lib.toLower name;
746+ passthru.imageTag =
747+ if tag != null
748+ then tag
749+ else
750+ lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
740751 paths = referencesByPopularity overallClosure;
741752 buildInputs = [ jq ];
742753 } ''
@@ -792,6 +803,7 @@ rec {
792803 '';
793804 result = runCommand "stream-${name}" {
794805 inherit (conf) imageName;
806+ passthru = { inherit (conf) imageTag; };
795807 buildInputs = [ makeWrapper ];
796808 } ''
797809 makeWrapper ${streamScript} $out --add-flags ${conf}
pkgs/build-support/docker/examples.nix+18
@@ -364,4 +364,22 @@ rec {
364364 created = "now";
365365 };
366366
367+ # buildImage without explicit tag
368+ bashNoTag = pkgs.dockerTools.buildImage {
369+ name = "bash-no-tag";
370+ contents = pkgs.bashInteractive;
371+ };
372+
373+ # buildLayeredImage without explicit tag
374+ bashNoTagLayered = pkgs.dockerTools.buildLayeredImage {
375+ name = "bash-no-tag-layered";
376+ contents = pkgs.bashInteractive;
377+ };
378+
379+ # buildImage without explicit tag
380+ bashNoTagStreamLayered = pkgs.dockerTools.streamLayeredImage {
381+ name = "bash-no-tag-stream-layered";
382+ contents = pkgs.bashInteractive;
383+ };
384+
367385}