diff options
| -rw-r--r-- | pkgs/common.nix | 6 | ||||
| -rw-r--r-- | services/monitoring/default.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/common.nix b/pkgs/common.nix index d6bd9c6..212d1e6 100644 --- a/pkgs/common.nix +++ b/pkgs/common.nix @@ -105,6 +105,10 @@ let }; }; + # we usually use nix versions as docker image tags, issue is nix versions + # have characters which docker does not support. this cleans them up! + sanitizeTag = tag: lib.replaceStrings [ "+" "~" ":" ] [ "_" "_" "_" ] tag; + soloOrDuoPort = p: with builtins; @@ -142,4 +146,4 @@ let "${me.tailscale.ip}:${host}:${container}"; }; in -images // ports +images // ports // { inherit sanitizeTag; } diff --git a/services/monitoring/default.nix b/services/monitoring/default.nix index ba87765..8c5031d 100644 --- a/services/monitoring/default.nix +++ b/services/monitoring/default.nix @@ -13,7 +13,7 @@ let victoriaImage = dockerTools.streamLayeredImage { name = "victoriametrics"; - tag = victoriametrics.version; + tag = common.sanitizeTag victoriametrics.version; fromImage = common.alpine.base; contents = [ victoriametrics ]; @@ -21,7 +21,7 @@ let grafanaImage = dockerTools.streamLayeredImage { name = "grafana"; - tag = grafana.version; + tag = common.sanitizeTag grafana.version; fromImage = common.alpine.base; contents = [ grafana ]; |