diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 36b4912..5f900e5 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -97,7 +97,7 @@ Describe containers using NixOS-style modules. There are a few options: ```nix { pkgs, ... }: { - config.docker-compose.services = { + config.services = { webserver = { service.useHostStore = true; @@ -123,7 +123,7 @@ Describe containers using NixOS-style modules. There are a few options: ```nix { - docker-compose.services.webserver = { config, pkgs, ... }: { + services.webserver = { config, pkgs, ... }: { nixos.configuration = {config, pkgs, ...}: { boot.isContainer = true; @@ -153,7 +153,7 @@ Describe containers using NixOS-style modules. There are a few options: ```nix { - docker-compose.services.webserver = { pkgs, ... }: { + services.webserver = { pkgs, ... }: { nixos.useSystemd = true; nixos.configuration.boot.tmpOnTmpfs = true; nixos.configuration.services.nginx.enable = true; @@ -170,7 +170,7 @@ Describe containers using NixOS-style modules. There are a few options: ```nix { - docker-compose.services.postgres = { + services.postgres = { service.image = "postgres:10"; service.volumes = [ "${toString ./.}/postgres-data:/var/lib/postgresql/data" ]; service.environment.POSTGRES_PASSWORD = "mydefaultpass"; diff --git a/examples/full-nixos/arion-compose.nix b/examples/full-nixos/arion-compose.nix index 2ed625c..dac420d 100644 --- a/examples/full-nixos/arion-compose.nix +++ b/examples/full-nixos/arion-compose.nix @@ -1,5 +1,5 @@ { - docker-compose.services.webserver = { pkgs, ... }: { + services.webserver = { pkgs, ... }: { nixos.useSystemd = true; nixos.configuration.boot.tmpOnTmpfs = true; nixos.configuration.services.nginx.enable = true; diff --git a/examples/minimal/arion-compose.nix b/examples/minimal/arion-compose.nix index 220d208..123c864 100644 --- a/examples/minimal/arion-compose.nix +++ b/examples/minimal/arion-compose.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - config.docker-compose.services = { + config.services = { webserver = { service.useHostStore = true; diff --git a/examples/nixos-unit/arion-compose.nix b/examples/nixos-unit/arion-compose.nix index 80105b1..3ef5be3 100644 --- a/examples/nixos-unit/arion-compose.nix +++ b/examples/nixos-unit/arion-compose.nix @@ -17,7 +17,7 @@ */ { - docker-compose.services.webserver = { config, pkgs, ... }: { + services.webserver = { config, pkgs, ... }: { nixos.configuration = {config, pkgs, ...}: { boot.isContainer = true; diff --git a/src/haskell/testdata/Arion/NixSpec/arion-compose.nix b/src/haskell/testdata/Arion/NixSpec/arion-compose.nix index 2ed625c..dac420d 100644 --- a/src/haskell/testdata/Arion/NixSpec/arion-compose.nix +++ b/src/haskell/testdata/Arion/NixSpec/arion-compose.nix @@ -1,5 +1,5 @@ { - docker-compose.services.webserver = { pkgs, ... }: { + services.webserver = { pkgs, ... }: { nixos.useSystemd = true; nixos.configuration.boot.tmpOnTmpfs = true; nixos.configuration.services.nginx.enable = true; diff --git a/src/nix/modules/service/host-store.nix b/src/nix/modules/service/host-store.nix index 0c9f1cb..3167608 100644 --- a/src/nix/modules/service/host-store.nix +++ b/src/nix/modules/service/host-store.nix @@ -1,6 +1,6 @@ /* - This service-level bind mounts the host store into the container + This service-level module bind mounts the host store into the container when the service.useHostStore option is set to true. */