summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-09-21 01:00:04 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-09-21 01:00:04 +0100
commitcbb1f39264ee2748595d21586e7110ff5ccf2d03 (patch)
treeffaff443b293d4c3a2a49245982aa998b3408d44
parentf140b5491638c3cbcce079f56b46982428fb7b93 (diff)
downloadnixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.tar
nixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.tar.gz
nixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.tar.bz2
nixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.tar.lz
nixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.tar.xz
nixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.tar.zst
nixpkgs-cbb1f39264ee2748595d21586e7110ff5ccf2d03.zip
nixosTests.docker-tools: Add image-with-certs
-rw-r--r--nixos/tests/docker-tools.nix7
-rw-r--r--pkgs/build-support/docker/examples.nix5
2 files changed, 9 insertions, 3 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index d76f70b791c..21a727dbd97 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -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")
+
   '';
 })
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 224ba07b774..1e9f07045e3 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -701,19 +701,18 @@ rec {
 
   # ensure that caCertificates builds
   image-with-certs = buildImage {
-    name = "curl";
+    name = "image-with-certs";
     tag = "latest";
 
     copyToRoot = pkgs.buildEnv {
       name = "image-with-certs-root";
       paths = [
-        pkgs.curl
+        pkgs.coreutils
         pkgs.dockerTools.caCertificates
       ];
     };
 
     config = {
-      Entrypoint = [ "/bin/curl" ];
     };
   };
 }