aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@christine.website>2022-09-13 12:57:50 +0000
committerXe Iaso <me@christine.website>2022-09-13 12:57:50 +0000
commitfc5dfe5c08a8ef8f64c92c477b934656954f35a8 (patch)
tree69b76e4e08eeb939a1bf162aee08e67eccbebbf5
parent979bcb2433e184344896cef5bf054e41c63dec0a (diff)
downloadxesite-fc5dfe5c08a8ef8f64c92c477b934656954f35a8.tar.xz
xesite-fc5dfe5c08a8ef8f64c92c477b934656954f35a8.zip
update flake metadata, can build a docker image now
Signed-off-by: Xe Iaso <me@christine.website>
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml2
-rw-r--r--flake.lock24
-rw-r--r--flake.nix10
4 files changed, 25 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 49fed12..1cddafe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3235,7 +3235,7 @@ dependencies = [
[[package]]
name = "xesite"
-version = "2.4.0"
+version = "2.5.0"
dependencies = [
"axum 0.5.15",
"axum-extra",
@@ -3265,7 +3265,7 @@ dependencies = [
"pfacts",
"pretty_env_logger",
"prometheus",
- "rand 0.8.5",
+ "rand 0.7.3",
"regex",
"reqwest",
"ructe",
diff --git a/Cargo.toml b/Cargo.toml
index 9b48fe0..abf3ade 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "xesite"
-version = "2.4.0"
+version = "2.5.0"
authors = ["Xe Iaso <me@xeiaso.net>"]
edition = "2018"
build = "src/build.rs"
diff --git a/flake.lock b/flake.lock
index ce75605..00462f0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
- "lastModified": 1652776076,
- "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+ "lastModified": 1659877975,
+ "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+ "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1652722411,
- "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=",
+ "lastModified": 1662220400,
+ "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
"owner": "nix-community",
"repo": "naersk",
- "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72",
+ "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
"type": "github"
},
"original": {
@@ -35,11 +35,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1653117584,
- "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=",
+ "lastModified": 1662934689,
+ "narHash": "sha256-mXi8hmhiunOVTeHiuouWXb0vTqjzp9v9kshMmI561Us=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83",
+ "rev": "a0b7e70db7a55088d3de0cc370a59f9fbcc906c3",
"type": "github"
},
"original": {
@@ -49,11 +49,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1653060744,
- "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+ "lastModified": 1662911228,
+ "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+ "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 169e701..6fe3915 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,6 +69,16 @@
name = "xesite-${bin.version}";
paths = [ config posts static bin ];
};
+
+ docker = pkgs.dockerTools.buildLayeredImage {
+ name = "xena/xesite";
+ tag = bin.version;
+ contents = [ default ];
+ config = {
+ Cmd = [ "${bin}/bin/xesite" ];
+ WorkdingDir = "${default}";
+ };
+ };
};
devShell = pkgs.mkShell {