[containers] Update a bunch of containers.
This commit is contained in:
@@ -12,7 +12,11 @@
|
||||
let
|
||||
strOpt = mkOption { type = str; };
|
||||
intOpt = mkOption { type = int; };
|
||||
boolOpt = mkOption {
|
||||
boolOptTrue = mkOption {
|
||||
type = bool;
|
||||
default = true;
|
||||
};
|
||||
boolOptFalse = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
};
|
||||
@@ -35,13 +39,14 @@
|
||||
volumes = strList;
|
||||
environment = attrOpt;
|
||||
environmentFiles = strList;
|
||||
public = boolOpt;
|
||||
public = boolOptFalse;
|
||||
user = mkOption {
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
};
|
||||
extraOptions = strList;
|
||||
oauthProxy = boolOpt;
|
||||
oauthProxy = boolOptFalse;
|
||||
alwaysPull = boolOptTrue;
|
||||
extraLabels = attrOpt;
|
||||
};
|
||||
});
|
||||
@@ -76,6 +81,7 @@
|
||||
extraOptions,
|
||||
oauthProxy,
|
||||
extraLabels,
|
||||
alwaysPull,
|
||||
}:
|
||||
let
|
||||
fqn = "${hostname}.${domain}";
|
||||
@@ -97,6 +103,7 @@
|
||||
{ "traefik.http.routers.${serviceName}.middlewares" = "oidc-auth@file"; }
|
||||
else
|
||||
{ };
|
||||
options = if alwaysPull then extraOptions ++ [ "--pull=always" ] else options;
|
||||
in
|
||||
{
|
||||
inherit
|
||||
@@ -106,7 +113,6 @@
|
||||
environment
|
||||
environmentFiles
|
||||
user
|
||||
extraOptions
|
||||
;
|
||||
autoStart = true;
|
||||
labels = {
|
||||
@@ -119,6 +125,7 @@
|
||||
// oauthLabels
|
||||
// homepageLabels
|
||||
// extraLabels;
|
||||
extraOptions = options;
|
||||
};
|
||||
in
|
||||
builtins.mapAttrs mkContainer config.virtualisation.web-containers.containers
|
||||
|
||||
Reference in New Issue
Block a user