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

Fix warnings

Browse source
This commit is contained in:
Robert Hensing 2019-10-29 11:04:25 +01:00
parent 697b3a27bb
commit 24503bcbe5
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/modules/ROOT/pages/index.adoc
View file

@ -97,7 +97,7 @@ Describe containers using NixOS-style modules. There are a few options:
```nix ```nix
{ pkgs, ... }: { pkgs, ... }:
{ {
config.docker-compose.services = { config.services = {
webserver = { webserver = {
service.useHostStore = true; service.useHostStore = true;
@ -123,7 +123,7 @@ Describe containers using NixOS-style modules. There are a few options:
```nix ```nix
{ {
docker-compose.services.webserver = { config, pkgs, ... }: { services.webserver = { config, pkgs, ... }: {
nixos.configuration = {config, pkgs, ...}: { nixos.configuration = {config, pkgs, ...}: {
boot.isContainer = true; boot.isContainer = true;
@ -153,7 +153,7 @@ Describe containers using NixOS-style modules. There are a few options:
```nix ```nix
{ {
docker-compose.services.webserver = { pkgs, ... }: { services.webserver = { pkgs, ... }: {
nixos.useSystemd = true; nixos.useSystemd = true;
nixos.configuration.boot.tmpOnTmpfs = true; nixos.configuration.boot.tmpOnTmpfs = true;
nixos.configuration.services.nginx.enable = true; nixos.configuration.services.nginx.enable = true;
@ -170,7 +170,7 @@ Describe containers using NixOS-style modules. There are a few options:
```nix ```nix
{ {
docker-compose.services.postgres = { services.postgres = {
service.image = "postgres:10"; service.image = "postgres:10";
service.volumes = [ "${toString ./.}/postgres-data:/var/lib/postgresql/data" ]; service.volumes = [ "${toString ./.}/postgres-data:/var/lib/postgresql/data" ];
service.environment.POSTGRES_PASSWORD = "mydefaultpass"; service.environment.POSTGRES_PASSWORD = "mydefaultpass";

2
examples/full-nixos/arion-compose.nix
View file

@ -1,5 +1,5 @@
{ {
docker-compose.services.webserver = { pkgs, ... }: { services.webserver = { pkgs, ... }: {
nixos.useSystemd = true; nixos.useSystemd = true;
nixos.configuration.boot.tmpOnTmpfs = true; nixos.configuration.boot.tmpOnTmpfs = true;
nixos.configuration.services.nginx.enable = true; nixos.configuration.services.nginx.enable = true;

2
examples/minimal/arion-compose.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
config.docker-compose.services = { config.services = {
webserver = { webserver = {
service.useHostStore = true; service.useHostStore = true;

2
examples/nixos-unit/arion-compose.nix
View file

@ -17,7 +17,7 @@
*/ */
{ {
docker-compose.services.webserver = { config, pkgs, ... }: { services.webserver = { config, pkgs, ... }: {
nixos.configuration = {config, pkgs, ...}: { nixos.configuration = {config, pkgs, ...}: {
boot.isContainer = true; boot.isContainer = true;

2
src/haskell/testdata/Arion/NixSpec/arion-compose.nix vendored
View file

@ -1,5 +1,5 @@
{ {
docker-compose.services.webserver = { pkgs, ... }: { services.webserver = { pkgs, ... }: {
nixos.useSystemd = true; nixos.useSystemd = true;
nixos.configuration.boot.tmpOnTmpfs = true; nixos.configuration.boot.tmpOnTmpfs = true;
nixos.configuration.services.nginx.enable = true; nixos.configuration.services.nginx.enable = true;

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

@ -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. when the service.useHostStore option is set to true.
*/ */