From 10faab98047db374ead73405135dfa0d6b2ebb27 Mon Sep 17 00:00:00 2001
From: Jules Lamur <jules.lamur@ssi.gouv.fr>
Date: Thu, 21 Apr 2022 15:08:01 +0200
Subject: [PATCH 1/3] docker: add parameter for extraPkgs

---
 docker.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker.nix b/docker.nix
index 0cd64856fec..207f1be96ad 100644
--- a/docker.nix
+++ b/docker.nix
@@ -4,6 +4,7 @@
 , tag ? "latest"
 , channelName ? "nixpkgs"
 , channelURL ? "https://nixos.org/channels/nixpkgs-unstable"
+, extraPkgs ? []
 }:
 let
   defaultPkgs = with pkgs; [
@@ -23,7 +24,7 @@ let
     iana-etc
     git
     openssh
-  ];
+  ] ++ extraPkgs;
 
   users = {
 

From 253bd7319e8ba7c5859cd2a9db546c35bfe45c00 Mon Sep 17 00:00:00 2001
From: Jules Lamur <jules.lamur@ssi.gouv.fr>
Date: Thu, 21 Apr 2022 15:21:54 +0200
Subject: [PATCH 2/3] docker: add params for substituters and
 trusted-substituters

---
 docker.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker.nix b/docker.nix
index 207f1be96ad..d3a6b531b26 100644
--- a/docker.nix
+++ b/docker.nix
@@ -5,6 +5,8 @@
 , channelName ? "nixpkgs"
 , channelURL ? "https://nixos.org/channels/nixpkgs-unstable"
 , extraPkgs ? []
+, substituters ? []
+, trustedSubstituters ? []
 }:
 let
   defaultPkgs = with pkgs; [
@@ -126,8 +128,12 @@ let
     sandbox = "false";
     build-users-group = "nixbld";
     trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
-  };
-  nixConfContents = (lib.concatStringsSep "\n" (lib.mapAttrsFlatten (n: v: "${n} = ${v}") nixConf)) + "\n";
+  } // (if substituters == [] then {} else {
+    substituters = substituters;
+  }) // (if trustedSubstituters == [] then {} else {
+    trusted-substituters = trustedSubstituters;
+  });
+  nixConfContents = (lib.concatStringsSep "\n" (lib.mapAttrsFlatten (n: v: "${n} = ${toString v}") nixConf)) + "\n";
 
   baseSystem =
     let

From e7d91a7e6152dca9e58ea19b66ff6d1e64abbadb Mon Sep 17 00:00:00 2001
From: Jules Lamur <jules.lamur@ssi.gouv.fr>
Date: Thu, 21 Apr 2022 15:36:17 +0200
Subject: [PATCH 3/3] docker: add param for extraEnv

---
 docker.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker.nix b/docker.nix
index d3a6b531b26..7bc54af3150 100644
--- a/docker.nix
+++ b/docker.nix
@@ -7,6 +7,7 @@
 , extraPkgs ? []
 , substituters ? []
 , trustedSubstituters ? []
+, extraEnv ? []
 }:
 let
   defaultPkgs = with pkgs; [
@@ -266,7 +267,7 @@ pkgs.dockerTools.buildLayeredImageWithNixDb {
       "GIT_SSL_CAINFO=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
       "NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
       "NIX_PATH=/nix/var/nix/profiles/per-user/root/channels:/root/.nix-defexpr/channels"
-    ];
+    ] ++ extraEnv;
   };
 
 }