Compare commits
4
Commits
b739294638
...
v0.0.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5c11ed181 | ||
|
|
36c9b880a7 | ||
|
|
c25ead672b | ||
|
|
4a6e3b2454 |
@@ -65,6 +65,7 @@ import Data.Time.Clock.POSIX (getPOSIXTime)
|
|||||||
import qualified Envy
|
import qualified Envy
|
||||||
import qualified Yore.DB as DB
|
import qualified Yore.DB as DB
|
||||||
import qualified Yore.Log as Log
|
import qualified Yore.Log as Log
|
||||||
|
import System.IO (hSetBuffering, BufferMode (..), stdout)
|
||||||
|
|
||||||
data ConfigT f = Config
|
data ConfigT f = Config
|
||||||
{ yorePort :: f =@@ Int ? 3000
|
{ yorePort :: f =@@ Int ? 3000
|
||||||
@@ -79,6 +80,8 @@ deriving instance Show Config
|
|||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = do
|
main = do
|
||||||
|
hSetBuffering stdout NoBuffering
|
||||||
|
|
||||||
cfg <-
|
cfg <-
|
||||||
Envy.load @ConfigT >>= \case
|
Envy.load @ConfigT >>= \case
|
||||||
Left errs -> do
|
Left errs -> do
|
||||||
|
|||||||
@@ -58,23 +58,38 @@
|
|||||||
# Return only the bin folder to curb image size
|
# Return only the bin folder to curb image size
|
||||||
compose.justStaticExecutables
|
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 =
|
image =
|
||||||
pkgs.dockerTools.buildImage {
|
pkgs.dockerTools.buildImage {
|
||||||
name = "git.pbrinkmeier.de/paul/yore";
|
name = "git.pbrinkmeier.de/paul/yore";
|
||||||
tag = yore.version;
|
tag = yore.version;
|
||||||
config.Cmd = [ "${yore}/bin/yore" ];
|
copyToRoot = [ pkgs.cacert ];
|
||||||
|
config.Cmd = [ "${entrypoint}/bin/run" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
entrypoint = pkgs.writeShellApplication {
|
||||||
|
name = "run";
|
||||||
|
runtimeInputs = [ pkgs.coreutils pkgs.dbmate yore ];
|
||||||
|
text = ''
|
||||||
|
mkdir -p /workspace/db
|
||||||
|
cp -r ${./db}/* /workspace/db
|
||||||
|
cd /workspace
|
||||||
|
dbmate up
|
||||||
|
|
||||||
|
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;
|
opium_ = opium.packages.${system}.opium;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
cabal-version: 3.4
|
cabal-version: 3.4
|
||||||
|
|
||||||
name: yore
|
name: yore
|
||||||
version: 0.0.1
|
version: 0.0.3
|
||||||
author: Paul Brinkmeier
|
author: Paul Brinkmeier
|
||||||
maintainer: hallo@pbrinkmeier.de
|
maintainer: hallo@pbrinkmeier.de
|
||||||
copyright: 2023 Paul Brinkmeier
|
copyright: 2023 Paul Brinkmeier
|
||||||
|
|||||||
Reference in New Issue
Block a user