From 38888fd58cb26827160c6e5622b8907fc5675919 Mon Sep 17 00:00:00 2001 From: lilly Date: Thu, 23 Jul 2026 14:23:49 +0200 Subject: [PATCH 1/2] fix compilation error in ssh-cli --- ssh-cli/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssh-cli/src/main.rs b/ssh-cli/src/main.rs index 0f891cb..c51f61b 100644 --- a/ssh-cli/src/main.rs +++ b/ssh-cli/src/main.rs @@ -110,7 +110,7 @@ async fn main() -> eyre::Result<()> { for i_lock in locks.iter() { println!(">> {}", i_lock.name); - print_lock_warnings(&lock); + print_lock_warnings(&i_lock); println!(" State: {:?}", i_lock.status.lock_state); println!(" Desired State: {:?}", i_lock.status.lock_target_level); println!(" Acitivty: {:?}", i_lock.status.activity_state); From 394b423b8ec34698c0ac5399953a4b400a3a90d9 Mon Sep 17 00:00:00 2001 From: lilly Date: Thu, 23 Jul 2026 14:23:49 +0200 Subject: [PATCH 2/2] rename Containerfile build stages to be more clear and consistent --- Containerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Containerfile b/Containerfile index 0cc80f3..9340bf9 100644 --- a/Containerfile +++ b/Containerfile @@ -18,7 +18,7 @@ RUN pnpm --dir=app/ run build -FROM docker.io/alpine:3.22 AS base +FROM docker.io/alpine:3.22 AS build-backend ARG APP_UID=10000 ARG APP_GID=10000 @@ -39,9 +39,6 @@ RUN addgroup -g $APP_GID dooris &&\ mkdir -p /var/www/dooris/ /usr/local/share/dooris/ /usr/local/src/dooris/ /var/cache/dooris/ &&\ chown -R dooris:dooris /var/www/dooris/ /usr/local/share/dooris/ /usr/local/src/dooris/ /var/cache/dooris/ - - -FROM base AS deps USER dooris ADD --link --chown=dooris:dooris api/pyproject.toml api/uv.lock api/ RUN uv venv $VIRTUAL_ENV &&\ @@ -49,7 +46,7 @@ RUN uv venv $VIRTUAL_ENV &&\ -FROM deps AS final +FROM build-backend AS final ADD --chown=dooris:dooris --link . /usr/local/src/dooris/ COPY --chown=dooris:dooris --from=build-frontend --link /usr/local/src/dooris/app/dist/ $DOORIS_SERVE_STATIC COPY --chown=dooris:dooris --from=build-ssh-cli --link /usr/local/src/dooris/ssh-cli/target/release/ssh-cli /usr/local/bin/ssh-cli