Unverified Commit 97f6e8b3 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #191988 from zombiezen/fix-docker-ca-certificates 

dockerTools: add missing mkdir to caCertificates derivation
parents fec59592 cbb1f392

nixos/tests/docker-tools.nix

+7 −0
Original line number Diff line number Diff line
@@ -424,5 +424,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { 
        docker.succeed("docker run --rm etc | grep localhost")

        docker.succeed("docker image rm etc:latest")



    with subtest("image-with-certs"):

        docker.succeed("<${examples.image-with-certs} docker load")

        docker.succeed("docker run --rm image-with-certs:latest test -r /etc/ssl/certs/ca-bundle.crt")

        docker.succeed("docker run --rm image-with-certs:latest test -r /etc/ssl/certs/ca-certificates.crt")

        docker.succeed("docker run --rm image-with-certs:latest test -r /etc/pki/tls/certs/ca-bundle.crt")

        docker.succeed("docker image rm image-with-certs:latest")



  '';

})

pkgs/build-support/docker/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ rec { 


  # This provides the ca bundle in common locations

  caCertificates = runCommand "ca-certificates" { } ''

    mkdir -p $out/etc/ssl/certs $out/etc/pki/tls/certs

    # Old NixOS compatibility.

    ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-bundle.crt

    # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.

pkgs/build-support/docker/examples.nix

+17 −0
Original line number Diff line number Diff line
@@ -698,4 +698,21 @@ rec { 
    tag = "latest";

    contents = [ pkgs.bashInteractive ./test-dummy ];

  };



  # ensure that caCertificates builds

  image-with-certs = buildImage {

    name = "image-with-certs";

    tag = "latest";



    copyToRoot = pkgs.buildEnv {

      name = "image-with-certs-root";

      paths = [

        pkgs.coreutils

        pkgs.dockerTools.caCertificates

      ];

    };



    config = {

    };

  };

}