From 759aa234c68aef9b03fda4f02b2cc060ad5c1edb Mon Sep 17 00:00:00 2001
From: Mona Mayrhofer <mona.mayrhofer@proton.me>
Date: Thu, 1 Feb 2024 14:22:05 +0100
Subject: [PATCH] convert to layered image

---
 .gitignore |  1 +
 flake.nix  | 58 +++++++++++++++++-------------------------------------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2be92b..a6554cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 result
+example/
diff --git a/flake.nix b/flake.nix
index c30c5f9..4c0c7db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,28 +22,13 @@
         hash = "sha256-nWzx44EVkEqWZw42Yi4NLa0b9lJ4HVIIqEvqEcjW+Q4=";
         stripRoot = false;
       };
-      #src = fetchurl {
-      #  url = "https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_${version}.tar.gz";
-      #  hash = "sha256-gPe5ZQn7MrK07R1nT6UK1D9YMUbVTUltzkOycvJFZ3o=";
-      #  stripRoot = false;
-      #};
 
       nativeBuildInputs = [pkgs.makeWrapper];
 
       buildInputs = [pkgs.dotnet-runtime_7];
 
       runtimeLibs = pkgs.lib.makeLibraryPath (with pkgs; [
-        gtk2
         sqlite
-        openal
-        cairo
-        libGLU
-        SDL2
-        freealut
-        libglvnd
-        pipewire
-        libpulseaudio
-        dotnet-runtime_7
       ]);
 
       installPhase = ''
@@ -70,29 +55,26 @@
           done
         '';
     };
+
+    home = pkgs.stdenv.mkDerivation {
+      name = "vintagestory-server-home-directories";
+      dontUnpack = true;
+      installPhase = ''
+        mkdir -p $out/home/dotnet
+        mkdir -p $out/game
+        mkdir -p $out/tmp
+      '';
+    };
   in {
     packages.x86_64-linux.default = server;
     images = {
-      default = pkgs.dockerTools.buildImage {
-        name = "vintage-server";
+      default = pkgs.dockerTools.buildLayeredImage {
+        name = "docker-vintagestory-server";
+        tag = "latest";
         architecture = "amd64";
 
-        copyToRoot =
-          [
-            (pkgs.buildEnv
-              {
-                name = "image-root";
-                paths = [
-                  pkgs.hello
-                  pkgs.coreutils
-                  pkgs.strace
-                  pkgs.bash
-                  pkgs.dotnet-sdk_7
-                  server
-                ];
-                pathsToLink = ["/bin"];
-              })
-          ]
+        contents =
+          [home server pkgs.bash pkgs.coreutils]
           ++ (with pkgs.dockerTools; [
             usrBinEnv
             binSh
@@ -100,14 +82,10 @@
             fakeNss
           ]);
 
-        runAsRoot = ''
-          mkdir -p /home/dotnet
-          mkdir -p /game
-        '';
-
         config = {
-          Env = ["HOME=/home/dotnet" "VS_DATA_PATH=/game"];
-          Cmd = ["/bin/bash"];
+          Env = ["HOME=/home/dotnet"];
+          Cmd = ["vintagestory-server" "--dataPath" "/game"];
+          #Cmd = ["/bin/bash"];
         };
       };
     };