diff options
| author | Ross Light <ross@zombiezen.com> | 2022-09-19 18:00:13 -0700 |
|---|---|---|
| committer | Ross Light <ross@zombiezen.com> | 2022-09-20 08:07:23 -0700 |
| commit | f140b5491638c3cbcce079f56b46982428fb7b93 (patch) | |
| tree | 20ee713c564782c92544a367f7faa7fbdcb36028 /pkgs/build-support/docker | |
| parent | 998f0f7924198b2460458728de59fe738997f28e (diff) | |
dockerTools: add missing mkdir to caCertificates derivation
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6876e9e73588e..e5b39cdd9dcee 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 ff3934941c7ba..224ba07b77437 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" ]; + }; + }; } |