chore(nix): fix registry url

flake.lock

@@ -151,22 +151,6 @@
         "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git"
       }
     },
-    "docker-nixpkgs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1678089139,
-        "narHash": "sha256-cK0RDcxR4eWMrdZIcqNVqnjo9k2LwVmNZO3qj1ctDXU=",
-        "owner": "nix-community",
-        "repo": "docker-nixpkgs",
-        "rev": "2205fb4968adf683324e6d0401b74b9d250d8f56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "docker-nixpkgs",
-        "type": "github"
-      }
-    },
     "encoding": {
       "flake": false,
       "locked": {
@@ -520,7 +504,6 @@
         "conduit-resumablesink": "conduit-resumablesink",
         "cryptoids": "cryptoids",
         "cryptonite": "cryptonite",
-        "docker-nixpkgs": "docker-nixpkgs",
         "encoding": "encoding",
         "esqueleto": "esqueleto",
         "flake-utils": "flake-utils",

flake.nix

@@ -28,11 +28,6 @@
       ref = "main";
     };
 
-    docker-nixpkgs = {
-      url = "github:nix-community/docker-nixpkgs";
-      flake = false;
-    };
-
     encoding = {
       url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work";
       flake = false;
@@ -91,7 +86,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-recent, docker-nixpkgs, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"]
+  outputs = inputs@{ self, nixpkgs, nixpkgs-recent, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"]
     (system:
       let frontendSource = pkgs.lib.sourceByRegex ./. [
             "^(assets|frontend)(/.*)?$"
@@ -116,8 +111,6 @@
           };
 
           overlays = [
-            (import "${docker-nixpkgs}/overlay.nix")
-
             (final: prev: let
               pkgs-recent = import nixpkgs-recent { inherit system; };
             in {  inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs-recent.stdenv) fetchurlBoot; })
@@ -134,9 +127,9 @@
           mkPushDocker = { imageName, dockerImage, defaultRegistry ? "docker://registry.uniworx.de/fradrive/fradrive" }: pkgs.writeScriptBin "push-${dockerImage.imageName}" ''
             #!${pkgs.zsh}/bin/zsh -xe
 
-            target=''${1-${defaultRegistry}/${imageName}:${dockerImage.imageTag}}
+            target=''${1:-${defaultRegistry}/${imageName}:${dockerImage.imageTag}}
             [[ -n "''${1}" ]] && shift
-            ${pkgs.skopeo}/bin/skopeo ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target}
+            ${pkgs.skopeo}/bin/skopeo --tmpdir ''${TMPDIR:-/var/tmp} ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target}
           '';
 
           inherit (pkgs.lib) recursiveUpdate;
@@ -146,10 +139,9 @@
         };
 
         apps = haskellFlake.apps // {
-          pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; defaultRegistry = "docker://registry.gitlab.uniworx.de/fradrive/fradrive"; }; };
+          pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; }; };
-          pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; defaultRegistry = "docker://registry.gitlab.uniworx.de/fradrive/fradrive"; }; };
+          pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; }; };
-          pushCIDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "nix-unstable"; dockerImage = pkgs.ciDocker; }; };
+          calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; exePath = ""; };
-          calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; execPath = ""; };
           jqChangelogJson = flake-utils.lib.mkApp { drv = pkgs.jqChangelogJson; };
         };
 

nix/docker/ci-version.json

@@ -1,3 +0,0 @@
-{
-  "version": "0.2.0"
-}

nix/docker/ci-version.json.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

nix/docker/default.nix

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Steffen Jost <jost@cip.ifi.lmu.de>,Steffen Jost <jost@tcs.ifi.lmu.de>
+# SPDX-FileCopyrightText: 2022-2023 Gregor Kleen <gregor@kleen.consulting>, Sarah Vaupel <sarah.vaupel@ifi.lmu.de>, Steffen Jost <jost@tcs.ifi.lmu.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -148,26 +148,7 @@ let
       };
   };
 in
-{
+mapAttrs (_name: mkUniworxDocker) {
-  ciDocker = prev.dockerTools.buildImageWithNixDb rec {
-    name = "uniworx-ci";
-    inherit created;
-    tag = (builtins.fromJSON (prev.lib.readFile ./ci-version.json)).version;
-    fromImage = prev.docker-nixpkgs.nix-unstable;
-
-    contents = with final; [
-      bash coreutils
-      minio-client
-      xz
-    ];
-    
-    runAsRoot = ''
-      #!${final.stdenv.shell}
-
-      ${final.coreutils}/bin/install -v -m 0777 -d /var/tmp
-    '';
-  };
-} // mapAttrs (_name: mkUniworxDocker) {
   uniworxDemoDocker = { isDemo = true; };
   uniworxDocker = { isDemo = false; };
 }