ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move modules into modules/{composition,service}

Browse source
This commit is contained in:
Robert Hensing 2019-02-13 17:33:19 +07:00
parent 3714883723
commit 359c8b601d
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/eval-composition.nix
View file

@ -18,7 +18,7 @@ let
builtinModules = [ builtinModules = [
argsModule argsModule
./docker-compose-module.nix ./modules/composition/docker-compose.nix
]; ];
argsModule = { argsModule = {

8
src/nix/docker-compose-module.nix → src/nix/modules/composition/docker-compose.nix
View file

@ -21,13 +21,13 @@ let
builtinModules = [ builtinModules = [
argsModule argsModule
./service.nix ../service/docker-compose-service.nix
./service-host-store.nix ../service/host-store.nix
]; ];
argsModule = { argsModule = {
_file = ./docker-compose-module.nix; _file = ./docker-compose.nix;
key = ./docker-compose-module.nix; key = ./docker-compose.nix;
config._module.args.pkgs = lib.mkForce pkgs; config._module.args.pkgs = lib.mkForce pkgs;
config._module.args.uid = uid; config._module.args.uid = uid;
config._module.args.customNixRootPath = customNixRootPath; config._module.args.customNixRootPath = customNixRootPath;

0
src/nix/service.nix → src/nix/modules/service/docker-compose-service.nix
View file

2
src/nix/service-host-store.nix → src/nix/modules/service/host-store.nix
View file

@ -19,7 +19,7 @@ in
}; };
config = mkIf config.service.useHostStore { config = mkIf config.service.useHostStore {
service.image = "arion-base"; service.image = "arion-base";
service.build.context = "${../arion-image}"; service.build.context = "${../../../arion-image}";
service.volumes = [ service.volumes = [
"${customNixRootPath}/nix/store:/nix/store" "${customNixRootPath}/nix/store:/nix/store"
"${customNixRootPath}${pkgs.buildEnv { name = "container-system-env"; paths = [ pkgs.bashInteractive pkgs.coreutils ]; }}:/run/system" "${customNixRootPath}${pkgs.buildEnv { name = "container-system-env"; paths = [ pkgs.bashInteractive pkgs.coreutils ]; }}:/run/system"