From f94321a27b8ef36423445b021f53593cb46a9864 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 1 Jul 2023 09:50:37 +0200 Subject: Don't try to cross-build docker images with nix --- flake.nix | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/flake.nix b/flake.nix index ac16a59..bbc1329 100644 --- a/flake.nix +++ b/flake.nix @@ -40,33 +40,9 @@ cp Caddyfile $out/ ''; }; - docker = pkgs.dockerTools.buildImage { - name = "alanpearce/website"; - fromImage = pkgs.dockerTools.pullImage { - imageName = "caddy"; - finalImageName = "caddy"; - finalImageTag = "2-alpine"; - imageDigest = "sha256:d4ca216d8dc515a49bc20fa22a449283ade6c8fc132eb6fa412ff351664d4917"; - sha256 = "auFzOG+6PSOVNXXXsRsEEThtIHJYM3JUkMQGcUt4cNQ="; - }; - created = flockenzeit.lib.ISO-8601 self.lastModified; - copyToRoot = pkgs.buildEnv { - name = "website"; - paths = with pkgs; [ - packages.default - nss.tools - ]; - pathsToLink = [ "/bin" "/public" ]; - }; - config = { - WorkingDir = "${packages.default}"; - ExposedPorts = { - "80/tcp" = { }; - }; - Volumes = { - "/data" = { }; - }; - }; + docker = import ./docker.nix { + inherit self pkgs flockenzeit; + website = packages.default; }; }; devShell = pkgs.mkShell { -- cgit 1.4.1