Compare commits
6
Commits
36c9b880a7
..
v0.0.7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dbc3103980 | ||
|
|
2dacd4f747 | ||
|
|
94ede9a168 | ||
|
|
c38574e005 | ||
|
|
700d53fbb0 | ||
|
|
c5c11ed181 |
@@ -41,8 +41,10 @@ By setting `$BASE_DIR` you can persist the database for later runs.
|
||||
|
||||
## TODO
|
||||
|
||||
- CI
|
||||
- Docker container (in flake)
|
||||
- try fourmolu
|
||||
- Test leap second handling in the `time` package
|
||||
- use queue to sync logging of indexer and main thread
|
||||
- [x] CI
|
||||
- [x] Docker container (in flake)
|
||||
- [x] try fourmolu
|
||||
- [x] Test leap second handling in the `time` package
|
||||
- [ ] Fix container shutdown delay
|
||||
- [ ] Fix `responseFile` always returning 200
|
||||
- [ ] use queue to sync logging of indexer and main thread
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -64,19 +64,26 @@
|
||||
name = "git.pbrinkmeier.de/paul/yore";
|
||||
tag = yore.version;
|
||||
copyToRoot = [ pkgs.cacert ];
|
||||
config.Cmd = [ "${entrypoint}/bin/run" ];
|
||||
config = {
|
||||
Cmd = [ "${entrypoint}/bin/run" ];
|
||||
StopSignal = "SIGINT";
|
||||
};
|
||||
};
|
||||
|
||||
entrypoint = pkgs.writeShellApplication {
|
||||
name = "run";
|
||||
runtimeInputs = [ pkgs.coreutils pkgs.dbmate yore ];
|
||||
text = ''
|
||||
mkdir -p /workspace/db
|
||||
cp -r ${./db}/* /workspace/db
|
||||
cd /workspace
|
||||
set -Eeuo pipefail
|
||||
|
||||
mkdir -p "''${YORE_DBMATE_DIR}/db"
|
||||
cp -r ${./db}/* "''${YORE_DBMATE_DIR}/db"
|
||||
cd "''${YORE_DBMATE_DIR}"
|
||||
dbmate up
|
||||
|
||||
yore
|
||||
# Replace bash and inherit PID 1
|
||||
cd /
|
||||
exec yore
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
cabal-version: 3.4
|
||||
|
||||
name: yore
|
||||
version: 0.0.2
|
||||
version: 0.0.7
|
||||
author: Paul Brinkmeier
|
||||
maintainer: hallo@pbrinkmeier.de
|
||||
copyright: 2023 Paul Brinkmeier
|
||||
|
||||
Reference in New Issue
Block a user