Skip to content

Commit 66cccaa

Browse files
author
FreeSynergy
committed
fix: sign_package, Inventory::open(DbConfig), add fs-db dep to fs-deploy
- fs-builder: key.sign() → key.sign_package() (method rename in fs-crypto) - fs-deploy: Inventory::open(&str) → Inventory::open(DbConfig::sqlite(...)) - fs-deploy: add fs-db workspace dependency - Add package.toml and Containerfile
1 parent fd9a3a5 commit 66cccaa

5 files changed

Lines changed: 39 additions & 2 deletions

File tree

Containerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM fedora:41
2+
3+
WORKDIR /app
4+
5+
# Copy pre-built binary (built by CI)
6+
COPY cli/target/release/fs-node-server /usr/local/bin/fs-node-server
7+
COPY cli/target/release/fs-node-cli /usr/local/bin/fsn
8+
9+
# Runtime user
10+
RUN useradd -r -s /sbin/nologin fsnode
11+
12+
USER fsnode
13+
14+
EXPOSE 8080 9090
15+
16+
ENTRYPOINT ["/usr/local/bin/fs-node-server"]
17+
18+
LABEL org.opencontainers.image.source="https://github.com/FreeSynergy/fs-node"
19+
LABEL org.opencontainers.image.description="FreeSynergy Node — deployment engine and API"

cli/crates/fs-builder/src/publish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl<'a> Publisher<'a> {
9191
k
9292
};
9393

94-
let sig = key.sign(content.as_bytes());
94+
let sig = key.sign_package(content.as_bytes());
9595
Ok(sig.to_hex())
9696
}
9797

cli/crates/fs-deploy/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ license.workspace = true
99
wasm = ["fs-plugin-runtime/wasm"]
1010

1111
[dependencies]
12+
fs-db = { workspace = true }
1213
fs-inventory = { workspace = true }
1314
fs-types = { workspace = true }
1415
fs-node-core = { workspace = true }

cli/crates/fs-deploy/src/deploy.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use std::time::Duration;
2323
use anyhow::{Context, Result};
2424
use chrono::Utc;
2525
use fs_container::SystemctlManager;
26+
use fs_db::DbConfig;
2627
use fs_inventory::models::ReleaseChannel;
2728
use fs_inventory::{
2829
InstalledResource, Inventory, ResourceStatus, ServiceInstance as InvServiceInstance,
@@ -348,7 +349,7 @@ async fn open_inventory(opts: &DeployOpts) -> Option<Inventory> {
348349
return None;
349350
}
350351
}
351-
match Inventory::open(&path.to_string_lossy()).await {
352+
match Inventory::open(DbConfig::sqlite(path.to_string_lossy().as_ref())).await {
352353
Ok(inv) => Some(inv),
353354
Err(e) => {
354355
warn!("Cannot open inventory {}: {e}", path.display());

package.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[package]
2+
name = "fs-node"
3+
version = "0.1.0"
4+
type = "program"
5+
description = "FreeSynergy Node — deployment engine, Auth, S3, Federation, Node API"
6+
license = "MIT"
7+
authors = ["FreeSynergy.Net"]
8+
repository = "https://github.com/FreeSynergy/fs-node"
9+
10+
[capabilities]
11+
provides = ["node.api", "node.deploy", "node.s3", "node.dns", "node.host", "node.federation"]
12+
requires = ["auth.oauth", "db.engine"]
13+
14+
[metadata]
15+
category = "program"
16+
tags = ["node", "deploy", "server", "s3", "federation"]

0 commit comments

Comments
 (0)