From b620dbdf8747e888c86e25237fbd736e7f443069 Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Fri, 15 Nov 2024 01:26:50 +0100
Subject: Factor out base images and postgres images with fixed hashes

Signed-off-by: Mel <einebeere@gmail.com>
---
 services/dendrite.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'services/dendrite.nix')

diff --git a/services/dendrite.nix b/services/dendrite.nix
index 5eecfd6..2987762 100644
--- a/services/dendrite.nix
+++ b/services/dendrite.nix
@@ -1,26 +1,17 @@
-{ lib, pkgs, unstablePkgs, ... }:
+{ lib, pkgs, unstablePkgs, auxiliaryPkgs, ... }:
 
 let
   inherit (pkgs) dockerTools;
+  inherit (auxiliaryPkgs) common;
 
   dendriteDir = "/srv/dendrite";
 
   dendrite = unstablePkgs.dendrite;
 
-  baseImageArm = dockerTools.pullImage {
-    imageName = "alpine";
-    imageDigest = "sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a";
-    sha256 = "06c0q5kk60i89y1d83a28wk282ymp806xjcsmlca4cwwqp590j0q";
-    finalImageName = "alpine";
-    finalImageTag = "3.20.3";
-    os = "linux";
-    arch = "arm64";
-  };
-
   dendriteImage = dockerTools.buildLayeredImage {
     name = "dendrite";
     tag = dendrite.version;
-    fromImage = baseImageArm;
+    fromImage = common.alpine.base;
 
     contents = [ dendrite ];
   };
@@ -53,8 +44,8 @@ in
     };
 
     dendrite-db = {
-      # TODO: pull through `dockerTools`.
-      image = "postgres:15-alpine";
+      inherit (common.postgres15) image imageFile;
+
       volumes = [ "${dendriteDir}/pgdata:/var/lib/postgresql/data" ];
 
       environment = {
-- 
cgit 1.4.1