project.name: nullOr str -> str
This commit is contained in:
parent
bd3e2fe4e3
commit
d90c7dc326
8 changed files with 13 additions and 11 deletions
|
@ -5,6 +5,7 @@
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
* Healthcheck-based dependencies in `service.depends_on`.
|
* Healthcheck-based dependencies in `service.depends_on`.
|
||||||
|
* The `project.name` option is now mandatory.
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
|
|
@ -112,17 +112,14 @@ Name of the project.
|
||||||
|
|
||||||
See link:https://docs.docker.com/compose/reference/envvars/#compose_project_name[COMPOSE_PROJECT_NAME]
|
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]
|
[discrete]
|
||||||
=== details
|
=== details
|
||||||
|
|
||||||
Type:: null or string
|
Type:: string
|
||||||
Default::
|
No Default:: {blank}
|
||||||
+
|
|
||||||
----
|
|
||||||
null
|
|
||||||
----
|
|
||||||
|
|
||||||
|
|
||||||
No Example:: {blank}
|
No Example:: {blank}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
project.name = "full-nixos";
|
||||||
services.webserver = { pkgs, lib, ... }: {
|
services.webserver = { pkgs, lib, ... }: {
|
||||||
nixos.useSystemd = true;
|
nixos.useSystemd = true;
|
||||||
nixos.configuration.boot.tmpOnTmpfs = true;
|
nixos.configuration.boot.tmpOnTmpfs = true;
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{
|
{
|
||||||
|
project.name = "nixos-unit";
|
||||||
services.webserver = { config, pkgs, ... }: {
|
services.webserver = { config, pkgs, ... }: {
|
||||||
|
|
||||||
nixos.configuration = {config, lib, options, pkgs, ...}: {
|
nixos.configuration = {config, lib, options, pkgs, ...}: {
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
{ lib, pkgs, ... }: {
|
{ lib, pkgs, ... }: {
|
||||||
|
config.project.name = "traefik";
|
||||||
config.services = {
|
config.services = {
|
||||||
traefik = {
|
traefik = {
|
||||||
image.command = [
|
image.command = [
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"project": {
|
"project": {
|
||||||
"name": null
|
"name": "unit-test-data"
|
||||||
},
|
},
|
||||||
"serviceInfo": {
|
"serviceInfo": {
|
||||||
"webserver": {
|
"webserver": {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
project.name = "unit-test-data";
|
||||||
services.webserver = { pkgs, ... }: {
|
services.webserver = { pkgs, ... }: {
|
||||||
nixos.useSystemd = true;
|
nixos.useSystemd = true;
|
||||||
nixos.configuration.boot.tmpOnTmpfs = true;
|
nixos.configuration.boot.tmpOnTmpfs = true;
|
||||||
|
|
|
@ -16,9 +16,10 @@ in
|
||||||
Name of the project.
|
Name of the project.
|
||||||
|
|
||||||
See ${link "https://docs.docker.com/compose/reference/envvars/#compose_project_name" "COMPOSE_PROJECT_NAME"}
|
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 = {
|
config = {
|
||||||
|
|
Loading…
Reference in a new issue