wb | code cleanups

IntersectMBO · Sep 11, 2024 · da7dee7 · da7dee7
1 parent 17977d3
commit da7dee7
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 226 deletions.
diff --git a/nix/workbench/backend/nomad-job.nix b/nix/workbench/backend/nomad-job.nix
@@ -7,8 +7,8 @@
 , lib
 , stateDir
 , profileData
-, containerSpecs
 , generatorTaskName
+, containerPkgs
 , oneTracerPerNode ? false
 , withSsh ? false
 }:
@@ -73,8 +73,8 @@ let
 
   entrypoint =
     let
-      coreutils  = containerSpecs.containerPkgs.coreutils.nix-store-path;
-      supervisor = containerSpecs.containerPkgs.supervisor.nix-store-path;
+      coreutils  = containerPkgs.coreutils.nix-store-path;
+      supervisor = containerPkgs.supervisor.nix-store-path;
     in escapeTemplate
       ''
       # Store entrypoint's envars and "uname" in a file for debugging purposes.
@@ -508,7 +508,7 @@ let
             # ERROR: cannot verify iog-cardano-perf.s3.eu-central-1.amazonaws.com's certificate, issued by 'CN=Amazon RSA 2048 M01,O=Amazon,C=US':
             # Unable to locally verify the issuer's authority.
             # To connect to iog-cardano-perf.s3.eu-central-1.amazonaws.com insecurely, use `--no-check-certificate'.
-            SSL_CERT_FILE = "${containerSpecs.containerPkgs.cacert.nix-store-path}/etc/ssl/certs/ca-bundle.crt";
+            SSL_CERT_FILE = "${containerPkgs.cacert.nix-store-path}/etc/ssl/certs/ca-bundle.crt";
           };
 
           # Sensible defaults.
@@ -937,9 +937,9 @@ let
                   ../service/ssh.nix
                   {
                     inherit pkgs;
-                    bashInteractive = containerSpecs.containerPkgs.bashInteractive.nix-store-path;
-                    coreutils = containerSpecs.containerPkgs.coreutils.nix-store-path;
-                    openssh_hacks = containerSpecs.containerPkgs.openssh_hacks.nix-store-path;
+                    bashInteractive = containerPkgs.bashInteractive.nix-store-path;
+                    coreutils = containerPkgs.coreutils.nix-store-path;
+                    sshdExecutable = "${containerPkgs.openssh_hacks.nix-store-path}/bin/sshd";
                   }
               ;
             in [
@@ -993,12 +993,12 @@ let
           {
             driver = "exec";
             config = {
-              command = "${containerSpecs.containerPkgs.bashInteractive.nix-store-path}/bin/bash";
+              command = "${containerPkgs.bashInteractive.nix-store-path}/bin/bash";
               args = ["local/entrypoint.sh"];
               nix_installables =
                 (lib.attrsets.mapAttrsToList
-                  (name: attr: attr.nix-store-path)
-                  containerSpecs.containerPkgs
+                  (name: attr: attr.installable)
+                  containerPkgs
                 )
               ;
             };