From 12369dd385f8db63603cad8924aacbdc2509ef53 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Fri, 17 Sep 2021 14:29:06 +0200
Subject: [PATCH] chore(gitlab-ci): ...

---
 .gitlab-ci.yml         |  2 +-
 nix/docker/default.nix | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43c6b825e..78d273513 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ workflow:
 
 default:
   image:
-    name: registry.gitlab.com/fradrive/fradrive/nix-unstable:kkq79z2lyip9wasq9sfd8mgqgifj9prs
+    name: registry.gitlab.com/fradrive/fradrive/nix-unstable:hcdba12p7ajl9xylgmw4kfn6p9c185xy
 
 variables:
   NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz"
diff --git a/nix/docker/default.nix b/nix/docker/default.nix
index 85f6f8fbf..beb2d9354 100644
--- a/nix/docker/default.nix
+++ b/nix/docker/default.nix
@@ -125,12 +125,16 @@ let
   };
 in
 {
-  ciDocker = prev.docker-nixpkgs.nix-flakes.overrideAttrs (oldAttrs: {
+  ciDocker = prev.dockerTools.buildImageWithNixDb rec {
+    name = "uniworx-ci";
     inherit created;
-    contents = oldAttrs.contents or [] ++ [
+    tag = fromImage.imageTag;
+    fromImage = prev.docker-nixpkgs.nix-unstable;
+
+    contents = [
       final.bash final.coreutils final.minio-client
     ];
-  });
+  };
 } // mapAttrs (_name: mkUniworxDocker) {
   uniworxDemoDocker = { isDemo = true; };
   uniworxDocker = { isDemo = false; };