fix: minor fixes

This commit is contained in:
Jaka Hudoklin 2019-10-06 21:42:19 +02:00
parent 9f05cd56b1
commit accd2dec1b
No known key found for this signature in database
GPG key ID: D1F18234B07BD6E2
4 changed files with 5 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }: { pkgs ? import <nixpkgs> {}, nixosPath ? toString <nixpkgs/nixos>, lib ? pkgs.lib }:
with lib; with lib;
@ -7,7 +7,7 @@ let
lib' = lib.extend (lib: self: import ./lib/extra.nix { inherit lib pkgs; }); lib' = lib.extend (lib: self: import ./lib/extra.nix { inherit lib pkgs; });
defaultSpecialArgs = { defaultSpecialArgs = {
inherit kubenix; inherit kubenix nixosPath;
}; };
# evalModules with same interface as lib.evalModules and kubenix as # evalModules with same interface as lib.evalModules and kubenix as

View file

@ -4,7 +4,7 @@ dockerTools.buildLayeredImage {
name = "nginx"; name = "nginx";
contents = [ nginx ]; contents = [ nginx ];
extraCommands = '' extraCommands = ''
mkdir etc mkdir -p etc
chmod u+w etc chmod u+w etc
echo "nginx:x:1000:1000::/:" > etc/passwd echo "nginx:x:1000:1000::/:" > etc/passwd
echo "nginx:x:1000:nginx" > etc/group echo "nginx:x:1000:nginx" > etc/group

View file

@ -235,6 +235,7 @@ in {
resources = mkOption { resources = mkOption {
description = "Alias for `config.kubernetes.api.resources` options"; description = "Alias for `config.kubernetes.api.resources` options";
default = {};
}; };
customTypes = mkOption { customTypes = mkOption {

View file

@ -49,6 +49,7 @@ in {
extraCheckInputs = mkOption { extraCheckInputs = mkOption {
description = "Extra check inputs"; description = "Extra check inputs";
type = types.listOf types.package; type = types.listOf types.package;
default = [];
}; };
testScript = mkOption { testScript = mkOption {