Inline oci image versions and add image digests
This commit is contained in:
parent
fdbc96135e
commit
7d3ce606ca
8 changed files with 10 additions and 18 deletions
|
|
@ -6,7 +6,6 @@
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.services.beszel-docker;
|
cfg = config.services.beszel-docker;
|
||||||
version = "0.18.7";
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
|
|
@ -21,7 +20,7 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
beszel = {
|
beszel = {
|
||||||
image = "henrygd/beszel:${version}";
|
image = "henrygd/beszel:0.18.7@sha256:a849ad80814b6a1a3be665304dcace5d4854b3bed7bde4dd1227e8ce1b82d477";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
networks = [
|
networks = [
|
||||||
"traefik"
|
"traefik"
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
dockhand = {
|
dockhand = {
|
||||||
image = "fnsys/dockhand:v1.0.32";
|
image = "fnsys/dockhand:v1.0.32@sha256:cda754fc7ccb4acd0ecc37cc37b9cf0d2b933bf19de89d47957b26ecf109a543";
|
||||||
volumes = [
|
volumes = [
|
||||||
"/var/run/docker.sock:/var/run/docker.sock"
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
hawser = {
|
hawser = {
|
||||||
image = "ghcr.io/finsys/hawser:0.2.42";
|
image = "ghcr.io/finsys/hawser:0.2.42@sha256:79f926e8d8fe31c0dfe90858f90b69bfd4cfbb113472605620b91a4b444dd557";
|
||||||
volumes = [
|
volumes = [
|
||||||
"/var/run/docker.sock:/var/run/docker.sock"
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,6 @@ let
|
||||||
|
|
||||||
cfg = config.services.netbird-client;
|
cfg = config.services.netbird-client;
|
||||||
|
|
||||||
clientVersion = "0.72.4";
|
|
||||||
|
|
||||||
clientConfiguration = lib.types.submodule {
|
clientConfiguration = lib.types.submodule {
|
||||||
options = {
|
options = {
|
||||||
setupKey = lib.mkOption {
|
setupKey = lib.mkOption {
|
||||||
|
|
@ -64,7 +62,7 @@ in {
|
||||||
|
|
||||||
virtualisation.oci-containers.containers = lib.mkIf (cfg.docker.setupKey != null) {
|
virtualisation.oci-containers.containers = lib.mkIf (cfg.docker.setupKey != null) {
|
||||||
netbird = {
|
netbird = {
|
||||||
image = "netbirdio/netbird:${clientVersion}-rootless";
|
image = "netbirdio/netbird:0.72.4-rootless@sha256:d42136aabccb82c5237d2ee73febde237e13e850727bcb6bbf5b3c8717ece142";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
hostname = "${config.networking.hostName}-docker";
|
hostname = "${config.networking.hostName}-docker";
|
||||||
networks = [
|
networks = [
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,6 @@ let
|
||||||
cfg = config.services.netbird-docker;
|
cfg = config.services.netbird-docker;
|
||||||
netbirdCfg = config.services.netbird;
|
netbirdCfg = config.services.netbird;
|
||||||
|
|
||||||
serverVersion = "0.72.4";
|
|
||||||
dashboardVersion = "2.39.0";
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
options.services.netbird-docker = {
|
options.services.netbird-docker = {
|
||||||
|
|
@ -60,7 +57,7 @@ in {
|
||||||
services.netbird.useRoutingFeatures = lib.mkDefault "server";
|
services.netbird.useRoutingFeatures = lib.mkDefault "server";
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
netbird-dashboard = {
|
netbird-dashboard = {
|
||||||
image = "netbirdio/dashboard:v${dashboardVersion}";
|
image = "netbirdio/dashboard:v2.39.0";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
networks = [
|
networks = [
|
||||||
"traefik"
|
"traefik"
|
||||||
|
|
@ -94,7 +91,7 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
netbird-server = {
|
netbird-server = {
|
||||||
image = "netbirdio/netbird-server:${serverVersion}";
|
image = "netbirdio/netbird-server:0.72.4@sha256:9ab98a37002517204010ee88a0c7f5e76b1fe6e2a736043db60efb7a02fbded3";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
networks = [
|
networks = [
|
||||||
"traefik"
|
"traefik"
|
||||||
|
|
@ -172,7 +169,7 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
netbird-proxy = {
|
netbird-proxy = {
|
||||||
image = "netbirdio/reverse-proxy:${serverVersion}";
|
image = "netbirdio/reverse-proxy:0.72.4@sha256:3104d5ca3a76ac224d268b9cc1d2f983eaf6fefbbb1cc78c3dbecd07f9d2a7e0";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
ports = [
|
ports = [
|
||||||
"51820:51820/udp"
|
"51820:51820/udp"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ let
|
||||||
|
|
||||||
cfg = config.services.pocket-id-docker;
|
cfg = config.services.pocket-id-docker;
|
||||||
pocketidCfg = config.services.pocket-id;
|
pocketidCfg = config.services.pocket-id;
|
||||||
version = "2.8.0";
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
|
|
@ -18,7 +17,7 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
pocket-id = {
|
pocket-id = {
|
||||||
image = "ghcr.io/pocket-id/pocket-id:v${version}";
|
image = "ghcr.io/pocket-id/pocket-id:v2.8.0@sha256:a073640418b2cfc8587c488a7270580b3ab95cae2c543f5d64bbbe1fd7ccbae8";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
networks = [
|
networks = [
|
||||||
"traefik"
|
"traefik"
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
traefik = {
|
traefik = {
|
||||||
image = "traefik:v3.6.6";
|
image = "traefik:v3.7.5@sha256:d6858791f9e74df44ca4014166647c41cdc2abd3bf2a71b832ca4e1c6a91b257";
|
||||||
cmd = [
|
cmd = [
|
||||||
"--providers.docker=true"
|
"--providers.docker=true"
|
||||||
"--providers.docker.exposedByDefault=false"
|
"--providers.docker.exposedByDefault=false"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.services.traefik-docker;
|
cfg = config.services.traefik-docker;
|
||||||
version = "3.7.5";
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
|
|
@ -30,7 +29,7 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
traefik = {
|
traefik = {
|
||||||
image = "traefik:v${version}";
|
image = "traefik:v3.7.5@sha256:d6858791f9e74df44ca4014166647c41cdc2abd3bf2a71b832ca4e1c6a91b257";
|
||||||
cmd = [
|
cmd = [
|
||||||
"--providers.docker=true"
|
"--providers.docker=true"
|
||||||
"--providers.docker.endpoint=http://docker-socket-proxy:2375"
|
"--providers.docker.endpoint=http://docker-socket-proxy:2375"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue