From 2dbe5ca0fdbf158e77f3beb8d0dc1a1ae42313bb Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 5 Oct 2024 22:22:02 -0400 Subject: [PATCH] feat(update): add missing images to update and use rec everywhere --- apps/update/src/misc.ts | 12 ++++++++++++ .../nos/modules/docker/forgejo/images/act_runner.nix | 4 ++-- .../nos/modules/docker/forgejo/images/forgejo.nix | 6 +++--- .../nos/modules/docker/forgejo/images/postgres.nix | 4 ++-- .../docker/freshrss/images/docker-hub-rss.nix | 4 ++-- .../nos/modules/docker/freshrss/images/freshrss.nix | 4 ++-- .../nos/modules/docker/freshrss/images/postgres.nix | 4 ++-- .../modules/docker/freshrss/images/rss-bridge.nix | 4 ++-- .../nos/modules/docker/gameyfin/images/gameyfin.nix | 4 ++-- devices/nos/modules/docker/hauk/images/hauk.nix | 4 ++-- .../nos/modules/docker/homepage/images/homepage.nix | 4 ++-- .../docker/immich/images/machine-learning.nix | 4 ++-- .../nos/modules/docker/immich/images/postgres.nix | 4 ++-- devices/nos/modules/docker/immich/images/server.nix | 4 ++-- .../modules/docker/media/bazarr/images/bazarr.nix | 4 ++-- .../nos/modules/docker/media/joal/images/joal.nix | 4 ++-- .../docker/media/prowlarr/images/flaresolverr.nix | 8 ++++---- .../docker/media/prowlarr/images/prowlarr.nix | 4 ++-- .../modules/docker/media/radarr/images/radarr.nix | 4 ++-- .../modules/docker/media/sabnzbd/images/sabnzbd.nix | 4 ++-- .../modules/docker/media/seerr/images/jellyseerr.nix | 6 +++--- .../modules/docker/media/sonarr/images/sonarr.nix | 8 ++++---- .../modules/docker/nextcloud/images/nextcloud.nix | 4 ++-- .../nos/modules/docker/nextcloud/images/nginx.nix | 4 ++-- .../modules/docker/nextcloud/images/onlyoffice.nix | 4 ++-- .../nos/modules/docker/nextcloud/images/postgres.nix | 4 ++-- .../nos/modules/docker/nextcloud/images/redis.nix | 4 ++-- .../nos/modules/docker/resume/images/postgres.nix | 4 ++-- .../modules/docker/resume/images/resume-client.nix | 4 ++-- .../modules/docker/resume/images/resume-server.nix | 4 ++-- .../docker/vaultwarden/images/vaultwarden.nix | 8 ++++---- .../nos/modules/docker/wg-easy/images/wg-easy.nix | 4 ++-- devices/nos/modules/jellyfin/images/jfa-go.nix | 8 ++++---- 33 files changed, 86 insertions(+), 74 deletions(-) diff --git a/apps/update/src/misc.ts b/apps/update/src/misc.ts index 502aa291..91ec0973 100644 --- a/apps/update/src/misc.ts +++ b/apps/update/src/misc.ts @@ -31,6 +31,18 @@ export const updateFlakeInputs = () => { export const updateDocker = () => { let updates = ''; + console.log('Updating jfa-go image'); + updates += spawnSync('updateImages', + [`${FLAKE}/devices/nos/modules/jellyfin`], + { shell: true }) + .stdout.toString(); + + console.log('Updating netdaemon image'); + updates += spawnSync('updateImages', + [`${FLAKE}/devices/homie/modules/home-assistant/netdaemon`], + { shell: true }) + .stdout.toString(); + const FILE = `${FLAKE}/devices/nos/modules/docker`; readdirSync(FILE, { withFileTypes: true, recursive: true }).forEach((path) => { diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix index f615f70e..6cacf941 100644 --- a/devices/nos/modules/docker/forgejo/images/act_runner.nix +++ b/devices/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; imageDigest = "sha256:5686ce9464839df7333098a61a802d16645d92fa4175b02684a536656d17a28f"; sha256 = "1wbx08ps26i4cpg3gz4sg919zy8dhabsq2szj18vf66xla57q8xw"; - finalImageName = "vegardit/gitea-act-runner"; + finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/docker/forgejo/images/forgejo.nix b/devices/nos/modules/docker/forgejo/images/forgejo.nix index 862b47a3..55872619 100644 --- a/devices/nos/modules/docker/forgejo/images/forgejo.nix +++ b/devices/nos/modules/docker/forgejo/images/forgejo.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "codeberg.org/forgejo/forgejo"; imageDigest = "sha256:1f7c844e1c723ba09411a31f9a3ef8f551e6d77c9ff4f200ef36b870e8c8a3d7"; - sha256 = "sha256-pD16fE+xr7qq+cndTGiXmOQBuAmEPD/Vvn57mLy3ilU="; - finalImageName = "codeberg.org/forgejo/forgejo"; + sha256 = "0mcanyy9hyvypvakyg4416w03r4qjxl4rpf9z6mbmbxi9xy7lgd4"; + finalImageName = imageName; finalImageTag = "8"; } diff --git a/devices/nos/modules/docker/forgejo/images/postgres.nix b/devices/nos/modules/docker/forgejo/images/postgres.nix index 30e38a8f..44b7a452 100644 --- a/devices/nos/modules/docker/forgejo/images/postgres.nix +++ b/devices/nos/modules/docker/forgejo/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "postgres"; imageDigest = "sha256:626046694f31a4a6a92511bbeca43f7e78ea8c6ae2f2ed70bbaa9b9abd5b67ab"; sha256 = "1z0rq47apkk5y5qlpd9yqsdhgz2vzkslnrmm4m2dxzq394h0nmbh"; - finalImageName = "postgres"; + finalImageName = imageName; finalImageTag = "14"; } diff --git a/devices/nos/modules/docker/freshrss/images/docker-hub-rss.nix b/devices/nos/modules/docker/freshrss/images/docker-hub-rss.nix index bff67e12..655fbe22 100644 --- a/devices/nos/modules/docker/freshrss/images/docker-hub-rss.nix +++ b/devices/nos/modules/docker/freshrss/images/docker-hub-rss.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "theconnman/docker-hub-rss"; imageDigest = "sha256:7a6dd3f09dd9a3ad4ec3b6cf83ceb3fb11f15fd8df8b480a851e974ee0ff8e26"; sha256 = "012cy2yqir36kpxb5jlyvsssm419bwrs4w7y8hz4nawvx69d1w69"; - finalImageName = "theconnman/docker-hub-rss"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/freshrss/images/freshrss.nix b/devices/nos/modules/docker/freshrss/images/freshrss.nix index f6c69f35..886a4459 100644 --- a/devices/nos/modules/docker/freshrss/images/freshrss.nix +++ b/devices/nos/modules/docker/freshrss/images/freshrss.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "freshrss/freshrss"; imageDigest = "sha256:baedf173d60b63c72f93fdb8480ee002d4622cd34103aac6510f45fdff41effe"; sha256 = "1d2mfvl02akq2wadvwqxgjx7ph7gw3d9ps5rcp8v4fyzq21xnmcv"; - finalImageName = "freshrss/freshrss"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/freshrss/images/postgres.nix b/devices/nos/modules/docker/freshrss/images/postgres.nix index 30e38a8f..44b7a452 100644 --- a/devices/nos/modules/docker/freshrss/images/postgres.nix +++ b/devices/nos/modules/docker/freshrss/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "postgres"; imageDigest = "sha256:626046694f31a4a6a92511bbeca43f7e78ea8c6ae2f2ed70bbaa9b9abd5b67ab"; sha256 = "1z0rq47apkk5y5qlpd9yqsdhgz2vzkslnrmm4m2dxzq394h0nmbh"; - finalImageName = "postgres"; + finalImageName = imageName; finalImageTag = "14"; } diff --git a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix index 59e9faf8..f73a7ccf 100644 --- a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; imageDigest = "sha256:fada58f35c97d4e50ae045176339722b69397a6803a46c00799a96160db84092"; sha256 = "0q4hnmy21v9d5fjya0xn9yl4k5yzxm5irwp13scch6rbx2nn7gnc"; - finalImageName = "rssbridge/rss-bridge"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/gameyfin/images/gameyfin.nix b/devices/nos/modules/docker/gameyfin/images/gameyfin.nix index 86f80825..1b468fd9 100644 --- a/devices/nos/modules/docker/gameyfin/images/gameyfin.nix +++ b/devices/nos/modules/docker/gameyfin/images/gameyfin.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "grimsi/gameyfin"; imageDigest = "sha256:f7994b4d4da378d909c173115d71cfeb704980184e42db432bd309d51d92725e"; sha256 = "07a10aw1x2qbfpcva30l0b33lhxshrsacxr1ia0lbbsch655iymq"; - finalImageName = "grimsi/gameyfin"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/hauk/images/hauk.nix b/devices/nos/modules/docker/hauk/images/hauk.nix index aa7a2663..fb95ab96 100644 --- a/devices/nos/modules/docker/hauk/images/hauk.nix +++ b/devices/nos/modules/docker/hauk/images/hauk.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "bilde2910/hauk"; imageDigest = "sha256:c7614b8340c25d91f32bfd00ebb92f81c05a4506410849e83d9102ba6304400e"; sha256 = "0dx7g8hrm4gz5bwd2v12l0hvyvbwrf9yiyqsn1pvw62ii8j721zp"; - finalImageName = "bilde2910/hauk"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/homepage/images/homepage.nix b/devices/nos/modules/docker/homepage/images/homepage.nix index 3d624f70..439b2340 100644 --- a/devices/nos/modules/docker/homepage/images/homepage.nix +++ b/devices/nos/modules/docker/homepage/images/homepage.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/gethomepage/homepage"; imageDigest = "sha256:671c2ed1a61b5dfbb9a1998c8738c3aeb1acf11adbc12563f81fcf4fd9802198"; sha256 = "14pfbr0h19qwydvs3hscmsylg0z4hzg3m86hdpk6z4mi663mjra2"; - finalImageName = "ghcr.io/gethomepage/homepage"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/immich/images/machine-learning.nix b/devices/nos/modules/docker/immich/images/machine-learning.nix index 5d25c2b0..70f493a1 100644 --- a/devices/nos/modules/docker/immich/images/machine-learning.nix +++ b/devices/nos/modules/docker/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-machine-learning"; imageDigest = "sha256:1221bc54568a0779227baeaa4282bb0e0db50831b66f9ac9afa9d78513df36ad"; sha256 = "003xbnmbqr6arv1cx3q64sbsk8galxf5889lqzwjyclwln35mxlp"; - finalImageName = "ghcr.io/immich-app/immich-machine-learning"; + finalImageName = imageName; finalImageTag = "release"; } diff --git a/devices/nos/modules/docker/immich/images/postgres.nix b/devices/nos/modules/docker/immich/images/postgres.nix index a998b568..2465c3b9 100644 --- a/devices/nos/modules/docker/immich/images/postgres.nix +++ b/devices/nos/modules/docker/immich/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "tensorchord/pgvecto-rs"; imageDigest = "sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0"; sha256 = "0h1s11z5d4svg2whm7gw11dwpddg5k90fp62q3zirycms787f4d3"; - finalImageName = "tensorchord/pgvecto-rs"; + finalImageName = imageName; finalImageTag = "pg14-v0.2.0"; } diff --git a/devices/nos/modules/docker/immich/images/server.nix b/devices/nos/modules/docker/immich/images/server.nix index 4b73de5a..25ce7663 100644 --- a/devices/nos/modules/docker/immich/images/server.nix +++ b/devices/nos/modules/docker/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-server"; imageDigest = "sha256:ac9fb82f2be3cc60d4e0c7f1ceb371d401d52573e387834d7a82776116458242"; sha256 = "08my8d66fq8pmg5kwjj9v85dnwv53sslsa6hbcvbpwg5pxbnmm52"; - finalImageName = "ghcr.io/immich-app/immich-server"; + finalImageName = imageName; finalImageTag = "release"; } diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix index ddb18c22..2ab6fa42 100644 --- a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/bazarr"; imageDigest = "sha256:137f55b12859e7f6905c513d403ba80dfe3b2afe7fa892c891c1982996a114ba"; sha256 = "18nlm339ji57rbmps1vbzni1c84j7k5ph9lxgs62396fal4rilg9"; - finalImageName = "ghcr.io/linuxserver/bazarr"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/joal/images/joal.nix b/devices/nos/modules/docker/media/joal/images/joal.nix index 2a55bf3f..79ad5139 100644 --- a/devices/nos/modules/docker/media/joal/images/joal.nix +++ b/devices/nos/modules/docker/media/joal/images/joal.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "anthonyraymond/joal"; imageDigest = "sha256:832718170bd2d3da97de1216a6fd2f3caf2d5d56065336320780dadaf4952c1e"; sha256 = "03wqqhpsjcdgr4q3n9vqyxb59324mxnwn8jn6kj2kb6zq8bz3qrj"; - finalImageName = "anthonyraymond/joal"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix b/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix index 346ad0a8..45195134 100644 --- a/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix +++ b/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "21hsmw/flaresolverr"; - imageDigest = "sha256:cfdaf2a0fc31b2d9c94d278a3236b39f0ca8594c2af421f9954973038ef4c2f3"; - sha256 = "0j3hd4zssdy8gdzhzccmpnpqgwrs0m2dx08ynm4d656jq8d84aa9"; - finalImageName = "21hsmw/flaresolverr"; + imageDigest = "sha256:14447de91cff69e78059864e6540d42a5b94a8ec1b1856485cd015afbab91b9c"; + sha256 = "16s1zalnznsj8w2h2rdjpll9zqgiy2iqs79d2znxn8cm6qvd8zb3"; + finalImageName = imageName; finalImageTag = "nodriver"; } diff --git a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix index 4d3e0386..fb7936a7 100644 --- a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix +++ b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/prowlarr"; imageDigest = "sha256:806916104582ff18024b1234a0c82e113c160037f0bf0e6c076e14528bbab331"; sha256 = "11wwcxn7m8nq7khl9vi97blxr0fwq0d3il53jq9bl09wncbg4in9"; - finalImageName = "ghcr.io/linuxserver/prowlarr"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/radarr/images/radarr.nix b/devices/nos/modules/docker/media/radarr/images/radarr.nix index c5123e19..d211a1b6 100644 --- a/devices/nos/modules/docker/media/radarr/images/radarr.nix +++ b/devices/nos/modules/docker/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/radarr"; imageDigest = "sha256:d758c5a5edc4cda1263260948b3f460f511430bccea505dca3cb70af01332ff8"; sha256 = "08q1fi21l3m0nsdncwc19qi3vgpzgswr2581x6a8kj9c3s1yh057"; - finalImageName = "ghcr.io/linuxserver/radarr"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix index 632f8a29..14526f15 100644 --- a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sabnzbd"; imageDigest = "sha256:a33738b946bee3bd2a754b2e576643d069ac2913d88290ef13d8e00f0c0e1224"; sha256 = "0zvfd75brjqkrpnqrg2gk9z3l0dn4d78x4iqzhm3gc9v1a03rp25"; - finalImageName = "ghcr.io/linuxserver/sabnzbd"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix b/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix index 3857517f..92e56cd4 100644 --- a/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix +++ b/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "docker.io/fallenbagel/jellyseerr"; imageDigest = "sha256:8f708df0ce3f202056bde5d7bff625eb59efe38f4ee47bdddc7560b6e4a5a214"; - sha256 = "sha256-3JBiy3VB41UAvK7i2igmfUw2nxtG1g3klbV46pi/d6U="; - finalImageName = "docker.io/fallenbagel/jellyseerr"; + sha256 = "19bppycfly5mjpj0vmj63fgkck3x4qldmqmfph05bqs1fp5n546w"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/sonarr/images/sonarr.nix b/devices/nos/modules/docker/media/sonarr/images/sonarr.nix index 73f92d02..5a984df8 100644 --- a/devices/nos/modules/docker/media/sonarr/images/sonarr.nix +++ b/devices/nos/modules/docker/media/sonarr/images/sonarr.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sonarr"; - imageDigest = "sha256:12570fbaddc8733664e1e5d9bb12a719cb07f9455c518097b0e6426f4960f884"; - sha256 = "10f4h2lwdwkpgcz6s855xz69hy74ha2yk6ia7k7gaghsq31cdn5z"; - finalImageName = "ghcr.io/linuxserver/sonarr"; + imageDigest = "sha256:db80ed8022dd15143644752a57db0553e48e23e3da54bdb9833d28ff89206a3c"; + sha256 = "0qbhjydya2bkv79hk358hrfp3lsnd75x2fqqkb6rx6yp0ywfn4nl"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/nextcloud/images/nextcloud.nix b/devices/nos/modules/docker/nextcloud/images/nextcloud.nix index b2ed750b..a8270ecb 100644 --- a/devices/nos/modules/docker/nextcloud/images/nextcloud.nix +++ b/devices/nos/modules/docker/nextcloud/images/nextcloud.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "nextcloud"; imageDigest = "sha256:88ad5957e747ddceb7641b072c22a0fbf85fe3b7ca9fc63a871d72b14e5d0ae1"; sha256 = "1mhn675qz5ymn1vsy14y4md9qnzmicpvhplnwl90mzwf3c1jvq3a"; - finalImageName = "nextcloud"; + finalImageName = imageName; finalImageTag = "fpm"; } diff --git a/devices/nos/modules/docker/nextcloud/images/nginx.nix b/devices/nos/modules/docker/nextcloud/images/nginx.nix index 6ab144d1..f5ae8a9c 100644 --- a/devices/nos/modules/docker/nextcloud/images/nginx.nix +++ b/devices/nos/modules/docker/nextcloud/images/nginx.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "nginx"; imageDigest = "sha256:d2eb56950b84efe34f966a2b92efb1a1a2ea53e7e93b94cdf45a27cf3cd47fc0"; sha256 = "0vzd1mh3z88wgc7cwrb1a7yhjzq0ldrg8rw5d7iak9nxx91p8w6q"; - finalImageName = "nginx"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/nextcloud/images/onlyoffice.nix b/devices/nos/modules/docker/nextcloud/images/onlyoffice.nix index 1da51de3..976bb640 100644 --- a/devices/nos/modules/docker/nextcloud/images/onlyoffice.nix +++ b/devices/nos/modules/docker/nextcloud/images/onlyoffice.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "onlyoffice/documentserver"; imageDigest = "sha256:b9e3c35eab182d3de822a53b109b0f27070f6eacea3b1388b9c50d1182f638f2"; sha256 = "1r59f8b1f8aaps7ghnlb4k9h29rbzr1mlpm1sy4gb7cqyz0i7l8y"; - finalImageName = "onlyoffice/documentserver"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/nextcloud/images/postgres.nix b/devices/nos/modules/docker/nextcloud/images/postgres.nix index 9a0c2200..5894f51d 100644 --- a/devices/nos/modules/docker/nextcloud/images/postgres.nix +++ b/devices/nos/modules/docker/nextcloud/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "postgres"; imageDigest = "sha256:20e49432a20e1a63bb985977c32ec8f110bc609b93de35ad4f19c5486abcefaa"; sha256 = "0jxkjj726jb1hal4j1vyhnrmbpyrkvawq5nf3dpiad8h3zamvk66"; - finalImageName = "postgres"; + finalImageName = imageName; finalImageTag = "14.2-alpine"; } diff --git a/devices/nos/modules/docker/nextcloud/images/redis.nix b/devices/nos/modules/docker/nextcloud/images/redis.nix index 67963f66..c49ce9aa 100644 --- a/devices/nos/modules/docker/nextcloud/images/redis.nix +++ b/devices/nos/modules/docker/nextcloud/images/redis.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "redis"; imageDigest = "sha256:558d0845026fe0bf091a00c0ad647ffacf9df385d780d433ca70661f7276f834"; sha256 = "0bbbzjl2fc2wvwj45j4z8kff2fj82qjk5nsgi79bqzm72x428mjb"; - finalImageName = "redis"; + finalImageName = imageName; finalImageTag = "7.0.0-alpine"; } diff --git a/devices/nos/modules/docker/resume/images/postgres.nix b/devices/nos/modules/docker/resume/images/postgres.nix index d7ba0c63..263772dd 100644 --- a/devices/nos/modules/docker/resume/images/postgres.nix +++ b/devices/nos/modules/docker/resume/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "postgres"; imageDigest = "sha256:620dc79c45816cff4f38f0b49c71f15a3bc6bab9439ba1eea3a76d23ebcf1e4d"; sha256 = "1iw8qhg4lg01w6ylq8js18m640v8yvpnxabmahm8xy5anj25cw7q"; - finalImageName = "postgres"; + finalImageName = imageName; finalImageTag = "15-alpine"; } diff --git a/devices/nos/modules/docker/resume/images/resume-client.nix b/devices/nos/modules/docker/resume/images/resume-client.nix index 9c531d9b..6e7ca7d8 100644 --- a/devices/nos/modules/docker/resume/images/resume-client.nix +++ b/devices/nos/modules/docker/resume/images/resume-client.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "amruthpillai/reactive-resume"; imageDigest = "sha256:9cbe8efde6f489da05367b5b2d0f0097b397f76fa1dcefd0352f174e50221826"; sha256 = "1ybsnr91518m7v2g9drp2pdibml4rsfa5mqnrjckwq1ai9mlg1rj"; - finalImageName = "amruthpillai/reactive-resume"; + finalImageName = imageName; finalImageTag = "client-latest"; } diff --git a/devices/nos/modules/docker/resume/images/resume-server.nix b/devices/nos/modules/docker/resume/images/resume-server.nix index df617eed..fb3ba582 100644 --- a/devices/nos/modules/docker/resume/images/resume-server.nix +++ b/devices/nos/modules/docker/resume/images/resume-server.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "amruthpillai/reactive-resume"; imageDigest = "sha256:f14519b5d72fab07a948ce0ac6ac8e09321f1b05865e9d951851467e8be0542f"; sha256 = "0znbhnixy22i80h2qjylsf8v0mg07scfirh2q5w8njf7sa52w0d6"; - finalImageName = "amruthpillai/reactive-resume"; + finalImageName = imageName; finalImageTag = "server-latest"; } diff --git a/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix b/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix index 8752ff62..2d3919eb 100644 --- a/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix +++ b/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "quay.io/vaultwarden/server"; - imageDigest = "sha256:71668d20d4208d70919cf8cb3caf3071d41ed4b7d95afe71125ccad8408b040d"; - sha256 = "0704a5hanxmssv9cq70n9hj74y0h8rbbr464z4b1k6f5kzxmc3vl"; - finalImageName = "quay.io/vaultwarden/server"; + imageDigest = "sha256:7899093c3d34eaf1c4f12cd4bb31b3cb4e0ccfa3823b3661feff4561be69c823"; + sha256 = "17skcav0dbvpysqhzah4wspwqvfz4pkk93c9ycvm6gmhqqm6kgbx"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/wg-easy/images/wg-easy.nix b/devices/nos/modules/docker/wg-easy/images/wg-easy.nix index 45ad6d10..b55923c8 100644 --- a/devices/nos/modules/docker/wg-easy/images/wg-easy.nix +++ b/devices/nos/modules/docker/wg-easy/images/wg-easy.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/wg-easy/wg-easy"; imageDigest = "sha256:66352ccb4b5095992550aa567df5118a5152b6ed31be34b0a8e118a3c3a35bf5"; sha256 = "0m41f39a68rmhv0k7fbxib7g42zpn06sgrv1iwzc6n946ad440al"; - finalImageName = "ghcr.io/wg-easy/wg-easy"; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/jellyfin/images/jfa-go.nix b/devices/nos/modules/jellyfin/images/jfa-go.nix index b72c6ea9..2d0af284 100644 --- a/devices/nos/modules/jellyfin/images/jfa-go.nix +++ b/devices/nos/modules/jellyfin/images/jfa-go.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "hrfee/jfa-go"; - imageDigest = "sha256:96b4744c1bbb25561e40121fc2132f96c08c569fdd9235d5de79e658a2682d88"; - sha256 = "0payy2warh81rkry49n7kh07088jxkb8lgans8rlpq8vf69xmqlp"; - finalImageName = "hrfee/jfa-go"; + imageDigest = "sha256:958d926bd245b6a6a11155f02f04b3d3e05130cc1da98290a68fa5d911fe2f0f"; + sha256 = "07a8g77lqan6aga7yc8yjhp05blh9l4a44avc2c29z9wg6y19wfa"; + finalImageName = imageName; finalImageTag = "unstable"; }