Merge branch 'mandatory-project.name' into HEAD

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Changed
 
 * Healthcheck-based dependencies in `service.depends_on`.
+* The `project.name` option is now mandatory.
 
 ### Added
 

docs/modules/ROOT/partials/NixOSOptions.adoc

@@ -112,17 +112,14 @@ Name of the project.
 
 See link:https://docs.docker.com/compose/reference/envvars/#compose_project_name[COMPOSE_PROJECT_NAME]
 
+This is not optional, because getting the project name from a directory name tends to produce different results for different repo checkout location names.
+
 
 [discrete]
 === details
 
-Type:: null or string
+Type:: string
-Default::
+No Default:: {blank}
-+
-----
-null
-----
-
 
 No Example:: {blank}
 

examples/full-nixos/arion-compose.nix

@@ -1,4 +1,5 @@
 {
+  project.name = "full-nixos";
   services.webserver = { pkgs, lib, ... }: {
     nixos.useSystemd = true;
     nixos.configuration.boot.tmpOnTmpfs = true;

examples/nixos-unit/arion-compose.nix

@@ -17,6 +17,7 @@
  */
 
 {
+  project.name = "nixos-unit";
   services.webserver = { config, pkgs, ... }: {
 
     nixos.configuration = {config, lib, options, pkgs, ...}: {

examples/traefik/arion-compose.nix

@@ -9,7 +9,7 @@
 
  */
 { lib, pkgs, ... }: {
-
+  config.project.name = "traefik";
   config.services = {
     traefik = {
       image.command = [

src/haskell/testdata/Arion/NixSpec/arion-compose.json

@@ -37,7 +37,7 @@
             }
         ],
         "project": {
-            "name": null
+            "name": "unit-test-data"
         },
         "serviceInfo": {
             "webserver": {

src/haskell/testdata/Arion/NixSpec/arion-compose.nix

@@ -1,4 +1,5 @@
 {
+  project.name = "unit-test-data";
   services.webserver = { pkgs, ... }: {
     nixos.useSystemd = true;
     nixos.configuration.boot.tmpOnTmpfs = true;

src/nix/modules/composition/composition.nix

@@ -16,9 +16,10 @@ in
         Name of the project.
 
         See ${link "https://docs.docker.com/compose/reference/envvars/#compose_project_name" "COMPOSE_PROJECT_NAME"}
+
+        This is not optional, because getting the project name from a directory name tends to produce different results for different repo checkout location names.
       '';
-      type = types.nullOr types.str;
+      type = types.str;
-      default = null;
     };
   };
   config = {