Merge pull request #2 from nix-community/import-dir

Import dir

README.md

@@ -88,6 +88,15 @@ All images are automatically built and pushed to Docker Hub.
 | [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-18.09.svg) |
 | [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-18.09.svg) |
 
+## Adding new images
+
+To add a new image to the project, create a new folder under
+`./images/<image-name>` with a default.nix that returns the docker image.
+
+Then run `nix-build release.nix -A <image-name>` to test that it builds, and
+then use
+`docker load -i /nix/store/...<image-name>.tar.gz` to load and test the image.
+
 ## Related projects
 
 The [docker-library](https://github.com/docker-library/official-images#readme)

docker-compose/default.nix

@@ -1,6 +0,0 @@
-{ buildCLIImage
-, docker-compose
-}:
-buildCLIImage {
-  drv = docker-compose;
-}

images/docker-compose/default.nix

@@ -0,0 +1,11 @@
+{ buildCLIImage
+, docker-compose ? null
+, python3Packages
+}:
+buildCLIImage {
+  drv =
+    if docker-compose == null
+    then python3Packages.docker_compose
+    else docker-compose # nixos 19.03+
+    ;
+}

images/nix-unstable/default.nix

@@ -0,0 +1,6 @@
+{ docker-nixpkgs
+, nixUnstable
+}:
+docker-nixpkgs.nix.override {
+  nix = nixUnstable;
+}

lib/importDir.nix

@@ -0,0 +1,21 @@
+{ lib }:
+
+importFn: baseDir:
+let
+  dirEntries =
+    builtins.attrNames
+      (lib.filterAttrs
+        (k: v: v == "directory")
+        (builtins.readDir baseDir));
+
+  absDirs =
+    builtins.map
+      (dir: "${toString baseDir}/${dir}")
+      dirEntries;
+
+  imports =
+    builtins.map
+      (dir: { name = builtins.baseNameOf dir; value = importFn dir; })
+      absDirs;
+in
+  builtins.listToAttrs imports

overlay.nix

@@ -1,26 +1,11 @@
-_: pkgs: {
+_: pkgs: let
-  # lib stuff can be in the top-level
+  importDir = import ./lib/importDir.nix {
+    inherit (pkgs) lib; 
+  };
+in {
+  # builder stuff can be in the top-level
   buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {};
 
   # docker images must be lower-cased
-  docker-nixpkgs = rec {
+  docker-nixpkgs = importDir (path: pkgs.callPackage path {}) ./images;
-
-    bash = pkgs.callPackage ./bash {};
-    busybox = pkgs.callPackage ./busybox {};
-    curl = pkgs.callPackage ./curl {};
-    docker-compose = pkgs.callPackage ./docker-compose {
-      docker-compose =
-         # master
-         pkgs.docker-compose or
-         # 18.09 or later
-         pkgs.python3Packages.docker_compose;
-    };
-    kubectl = pkgs.callPackage ./kubectl {};
-    kubernetes-helm = pkgs.callPackage ./kubernetes-helm {};
-    nix = pkgs.callPackage ./nix {};
-    nix-unstable = nix.override {
-      nix = pkgs.nixUnstable;
-    };
-
-  };
 }