fix: give the container a trust store

The Proton Drive client verifies TLS against the system CAs, and
debian-slim ships none at all — no /etc/ssl/certs, no bundle — so every
request out of the container died at the handshake with "No CA
certificates were loaded from the system", before it could even be a
login. `webpki-roots` is compiled in, but choosing it happens inside the
SDK when it builds its HTTP client, so the image is the place to fix it.

Also answer `--help` before reading the configuration: a host that has
not been set up yet is exactly where that question gets asked, and it
was being met with "DIARY_USER must be set".

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D5Gk8FPkRXu1e6Nj2BCRE1
This commit is contained in:
nvrlandClaude Opus 5 committed 2026-09-05 12:52:36 +02:00
1 parent bac8a4c1d4
commit ca0039400e
2 files changed
+18 -6

No files matched your search

+8 -2
View File
@@ -21,9 +21,15 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
cargo build --release --locked \ cargo build --release --locked \
&& cp target/release/narl-diary /usr/local/bin/narl-diary && cp target/release/narl-diary /usr/local/bin/narl-diary
# 3. Runtime. SQLite is compiled into the binary, so nothing else is needed. # 3. Runtime. SQLite is compiled into the binary; the only thing the image has
# to supply is a trust store. The Proton Drive client verifies TLS against
# the system CAs, and debian-slim ships none — without this, every request
# to Proton fails with "No CA certificates were loaded from the system".
FROM debian:trixie-slim FROM debian:trixie-slim
RUN useradd --system --uid 10001 --create-home --home-dir /home/diary diary \ RUN apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
&& useradd --system --uid 10001 --create-home --home-dir /home/diary diary \
&& mkdir -p /data \ && mkdir -p /data \
&& chown diary:diary /data && chown diary:diary /data
COPY --from=build /usr/local/bin/narl-diary /usr/local/bin/narl-diary COPY --from=build /usr/local/bin/narl-diary /usr/local/bin/narl-diary
+10 -4
View File
@@ -40,6 +40,16 @@ async fn main() -> Result<()> {
.with(tracing_subscriber::fmt::layer()) .with(tracing_subscriber::fmt::layer())
.init(); .init();
// Asked before anything is loaded: `--help` must answer on a host that has
// not been configured yet, which is exactly where it gets asked.
if matches!(
std::env::args().nth(1).as_deref(),
Some("help" | "--help" | "-h")
) {
print!("{}", cli::USAGE);
return Ok(());
}
let config = Config::from_env()?; let config = Config::from_env()?;
tokio::fs::create_dir_all(config.uploads_dir()) tokio::fs::create_dir_all(config.uploads_dir())
.await .await
@@ -64,10 +74,6 @@ async fn main() -> Result<()> {
); );
return Ok(()); return Ok(());
} }
Some("help" | "--help" | "-h") => {
print!("{}", cli::USAGE);
return Ok(());
}
Some(other) => { Some(other) => {
anyhow::bail!("unknown command {other:?}\n\n{}", cli::USAGE); anyhow::bail!("unknown command {other:?}\n\n{}", cli::USAGE);
} }