8 Commits
Author SHA1 Message Date
Paul Brinkmeier 2dacd4f747 Use /tmp for running dbmate
deliver / deliver (push) Successful in 2m6s
2025-10-07 16:48:53 +02:00
paul 94ede9a168 Use SIGINT as container StopSignal
deliver / deliver (push) Failing after 20s
2025-10-07 13:47:12 +02:00
Paul Brinkmeier c38574e005 Add exec in entrypoint
deliver / deliver (push) Successful in 1m40s
2025-10-07 13:26:46 +02:00
Paul Brinkmeier 700d53fbb0 Update todo list 2025-10-07 13:09:24 +02:00
Paul Brinkmeier c5c11ed181 Don't buffer stdout
deliver / deliver (push) Successful in 1m36s
2025-10-07 12:53:14 +02:00
paul 36c9b880a7 Merge pull request 'Add entrypoint script and cacerts to image' (#2) from image-entry into main
Reviewed-on: #2
2025-10-07 12:50:53 +02:00
paul c25ead672b Add entrypoint script and cacerts to image
deliver / deliver (push) Successful in 2m0s
build / build (pull_request) Successful in 16s
2025-10-07 12:43:48 +02:00
Paul Brinkmeier 4a6e3b2454 Reformat image flake output 2025-10-07 10:28:30 +02:00
4 changed files with 41 additions and 14 deletions
+7 -5
View File
@@ -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
+3
View File
@@ -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
+32 -10
View File
@@ -58,22 +58,44 @@
# Return only the bin folder to curb image size
compose.justStaticExecutables
];
in {
packages = rec {
default = yore;
inherit yore;
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
'';
image =
pkgs.dockerTools.buildImage {
name = "git.pbrinkmeier.de/paul/yore";
tag = yore.version;
config.Cmd = [ "${yore}/bin/yore" ];
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 /tmp/yore-workspace/db
cp -r ${./db}/* /tmp/yore-workspace/db
cd /tmp/yore-workspace/db
dbmate up
# Replace bash and inherit PID 1
cd /
exec yore
'';
};
in {
packages = rec {
default = yore;
inherit yore image;
yore-meta = pkgs.runCommand "yore-meta" {} ''
mkdir -p $out
echo -n ${yore.version} > $out/version
echo -n ${image.drvAttrs.imageName}:${image.drvAttrs.imageTag} > $out/image-tag
'';
opium_ = opium.packages.${system}.opium;
};
+1 -1
View File
@@ -1,7 +1,7 @@
cabal-version: 3.4
name: yore
version: 0.0.1
version: 0.0.6
author: Paul Brinkmeier
maintainer: hallo@pbrinkmeier.de
copyright: 2023 Paul Brinkmeier