all repos — homestead @ 8c1a971b4935e5cf0abd7c8ba03b45ebe039fcaf

Code for my website

Don't try to cross-build docker images with nix

Alan Pearce
commit

8c1a971b4935e5cf0abd7c8ba03b45ebe039fcaf

parent

1b39fef5f4683391da076827a1dba6e31162f0f1

1 file changed, 3 insertions(+), 27 deletions(-)

jump to
M flake.nix → flake.nix
@@ -40,33 +40,9 @@ postInstall = ''
                 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 {