aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@xeiaso.net>2024-01-17 12:31:37 -0500
committerXe Iaso <me@xeiaso.net>2024-01-17 12:38:24 -0500
commitf9567626003bf741415308aa8d7ee3fa20382fb7 (patch)
tree7995a7b619e49dd2343082150f8ac89f26dfe39e
parent71d942d2664615d081d14037ad9930848f6a72b4 (diff)
downloadxesite-f9567626003bf741415308aa8d7ee3fa20382fb7.tar.xz
xesite-f9567626003bf741415308aa8d7ee3fa20382fb7.zip
base docker image on alpine so fly ssh/sftp works
Signed-off-by: Xe Iaso <me@xeiaso.net>
-rw-r--r--flake.lock13
-rw-r--r--flake.nix7
-rw-r--r--lume/src/_components/.gitignore1
3 files changed, 21 insertions, 0 deletions
diff --git a/flake.lock b/flake.lock
index ff78d43..90f3843 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,17 @@
{
"nodes": {
+ "alpineLinux": {
+ "flake": false,
+ "locked": {
+ "narHash": "sha256-8xQGO1CqQbpkB8dapJbHiwr7taA+dGAYAZYdBurLhvA=",
+ "type": "file",
+ "url": "https://cdn.xeiaso.net/file/christine-static/hack/alpine-amd64-3.19.0.tar.gz"
+ },
+ "original": {
+ "type": "file",
+ "url": "https://cdn.xeiaso.net/file/christine-static/hack/alpine-amd64-3.19.0.tar.gz"
+ }
+ },
"crane": {
"inputs": {
"nixpkgs": [
@@ -230,6 +242,7 @@
},
"root": {
"inputs": {
+ "alpineLinux": "alpineLinux",
"deno2nix": "deno2nix",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils",
diff --git a/flake.nix b/flake.nix
index 2dcf6a9..4a2a504 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,11 @@
typst.url = "github:typst/typst";
typst.inputs.nixpkgs.follows = "nixpkgs";
+
+ alpineLinux = {
+ flake = false;
+ url = "file+https://cdn.xeiaso.net/file/christine-static/hack/alpine-amd64-3.19.0.tar.gz";
+ };
};
outputs =
@@ -37,6 +42,7 @@
, iosevka
, typst
, gomod2nix
+ , alpineLinux
, ...
}:
flake-utils.lib.eachSystem [
@@ -137,6 +143,7 @@
docker = pkgs.dockerTools.buildLayeredImage {
name = "ghcr.io/xe/site/bin";
tag = "latest";
+ fromImage = alpineLinux;
contents = with pkgs; [ cacert typst-dev dhall-json deno pagefind ];
config = {
Cmd = [ "${bin}/bin/xesite" "--data-dir=/data" ];
diff --git a/lume/src/_components/.gitignore b/lume/src/_components/.gitignore
new file mode 100644
index 0000000..ac2b540
--- /dev/null
+++ b/lume/src/_components/.gitignore
@@ -0,0 +1 @@
+ads.njk \ No newline at end of file