From f140b5491638c3cbcce079f56b46982428fb7b93 Mon Sep 17 00:00:00 2001
From: Ross Light <ross@zombiezen.com>
Date: Mon, 19 Sep 2022 18:00:13 -0700
Subject: dockerTools: add missing mkdir to caCertificates derivation

---
 pkgs/build-support/docker/default.nix  |  1 +
 pkgs/build-support/docker/examples.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

(limited to 'pkgs/build-support/docker')

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 6876e9e7358..e5b39cdd9dc 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -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.
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index ff3934941c7..224ba07b774 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -698,4 +698,22 @@ rec {
     tag = "latest";
     contents = [ pkgs.bashInteractive ./test-dummy ];
   };
+
+  # ensure that caCertificates builds
+  image-with-certs = buildImage {
+    name = "curl";
+    tag = "latest";
+
+    copyToRoot = pkgs.buildEnv {
+      name = "image-with-certs-root";
+      paths = [
+        pkgs.curl
+        pkgs.dockerTools.caCertificates
+      ];
+    };
+
+    config = {
+      Entrypoint = [ "/bin/curl" ];
+    };
+  };
 }
-- 
cgit 1.4.1