CCCHH/dooris
Watch
1
1
Fork
You've already forked dooris
 0
Code Issues 6 Pull requests 1 Releases Packages 1 Activity Actions

Compare commits

base: CCCHH:394b423b8ec34698c0ac5399953a4b400a3a90d9
Branches Tags
CCCHH:main
CCCHH:cat-language
..
compare: CCCHH:5850cff5367b0a46f2098aabddf8d51895aba524
Branches Tags
CCCHH:main
CCCHH:cat-language
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Containerfile
View file

@ -18,7 +18,7 @@ RUN pnpm --dir=app/ run build
FROM docker.io/alpine:3.22 AS build-backend FROM docker.io/alpine:3.22 AS base
ARG APP_UID=10000 ARG APP_UID=10000
ARG APP_GID=10000 ARG APP_GID=10000
@ -39,6 +39,9 @@ RUN addgroup -g $APP_GID dooris &&\
mkdir -p /var/www/dooris/ /usr/local/share/dooris/ /usr/local/src/dooris/ /var/cache/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/ chown -R dooris:dooris /var/www/dooris/ /usr/local/share/dooris/ /usr/local/src/dooris/ /var/cache/dooris/
FROM base AS deps
USER dooris USER dooris
ADD --link --chown=dooris:dooris api/pyproject.toml api/uv.lock api/ ADD --link --chown=dooris:dooris api/pyproject.toml api/uv.lock api/
RUN uv venv $VIRTUAL_ENV &&\ RUN uv venv $VIRTUAL_ENV &&\
@ -46,7 +49,7 @@ RUN uv venv $VIRTUAL_ENV &&\
FROM build-backend AS final FROM deps AS final
ADD --chown=dooris:dooris --link . /usr/local/src/dooris/ 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-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 COPY --chown=dooris:dooris --from=build-ssh-cli --link /usr/local/src/dooris/ssh-cli/target/release/ssh-cli /usr/local/bin/ssh-cli

2
ssh-cli/src/main.rs
View file

@ -110,7 +110,7 @@ async fn main() -> eyre::Result<()> {
for i_lock in locks.iter() { for i_lock in locks.iter() {
println!(">> {}", i_lock.name); println!(">> {}", i_lock.name);
print_lock_warnings(&i_lock); print_lock_warnings(&lock);
println!(" State: {:?}", i_lock.status.lock_state); println!(" State: {:?}", i_lock.status.lock_state);
println!(" Desired State: {:?}", i_lock.status.lock_target_level); println!(" Desired State: {:?}", i_lock.status.lock_target_level);
println!(" Acitivty: {:?}", i_lock.status.activity_state); println!(" Acitivty: {:?}", i_lock.status.activity_state);