Use SIGINT as container StopSignal

Reviewed-on: #2

README.md

@@ -41,8 +41,10 @@ By setting `$BASE_DIR` you can persist the database for later runs.
 
 ## TODO
 
-- CI
+- [x] CI
-- Docker container (in flake)
+- [x] Docker container (in flake)
-- try fourmolu
+- [x] try fourmolu
-- Test leap second handling in the `time` package
+- [x] Test leap second handling in the `time` package
-- use queue to sync logging of indexer and main thread
+- [ ] Fix container shutdown delay
+- [ ] Fix `responseFile` always returning 200
+- [ ] use queue to sync logging of indexer and main thread

app/Main.hs

@@ -65,6 +65,7 @@ import Data.Time.Clock.POSIX (getPOSIXTime)
 import qualified Envy
 import qualified Yore.DB as DB
 import qualified Yore.Log as Log
+import System.IO (hSetBuffering, BufferMode (..), stdout)
 
 data ConfigT f = Config
   { yorePort :: f =@@ Int ? 3000
@@ -79,6 +80,8 @@ deriving instance Show Config
 
 main :: IO ()
 main = do
+  hSetBuffering stdout NoBuffering
+
   cfg <-
     Envy.load @ConfigT >>= \case
       Left errs -> do

flake.nix

@@ -58,22 +58,43 @@
             # Return only the bin folder to curb image size
             compose.justStaticExecutables
           ];
+
+        image =
+          pkgs.dockerTools.buildImage {
+            name = "git.pbrinkmeier.de/paul/yore";
+            tag = yore.version;
+            copyToRoot = [ pkgs.cacert ];
+            config = {
+              Cmd = [ "${entrypoint}/bin/run" ];
+              StopSignal = "SIGINT";
+            };
+          };
+
+        entrypoint = pkgs.writeShellApplication {
+          name = "run";
+          runtimeInputs = [ pkgs.coreutils pkgs.dbmate yore ];
+          text = ''
+            set -Eeuo pipefail
+
+            mkdir -p /workspace/db
+            cp -r ${./db}/* /workspace/db
+            cd /workspace
+            dbmate up
+
+            # Replace bash and inherit PID 1
+            exec yore
+          '';
+        };
       in {
         packages = rec {
           default = yore;
-          inherit yore;
+          inherit yore image;
           yore-meta = pkgs.runCommand "yore-meta" {} ''
             mkdir -p $out
             echo -n ${yore.version} > $out/version
-            echo -n git.pbrinkmeier.de/paul/yore:${yore.version} > $out/image-tag
+            echo -n ${image.drvAttrs.imageName}:${image.drvAttrs.imageTag} > $out/image-tag
           '';
 
-          image =
-            pkgs.dockerTools.buildImage {
-              name = "git.pbrinkmeier.de/paul/yore";
-              tag = yore.version;
-              config.Cmd = [ "${yore}/bin/yore" ];
-            };
 
           opium_ = opium.packages.${system}.opium;
         };

yore.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.4
 
 name:           yore
-version:        0.0.1
+version:        0.0.5
 author:         Paul Brinkmeier
 maintainer:     hallo@pbrinkmeier.de
 copyright:      2023 Paul Brinkmeier