Skip to content

Commit d85ea62

Browse files
fix: unlock file on delete
feat: script for auditing configuration access rights fix: bottom bars overlapping on android 15 fix: wait before healthcheck on configuration reload
1 parent 9413f94 commit d85ea62

File tree

28 files changed

+489
-260
lines changed

28 files changed

+489
-260
lines changed

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG RUST_VERSION
77
ARG FLUTTER_VERSION
88

99
# Set up an environnement to cross-compile the app for musl to create a statically-linked binary
10-
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION} AS backend-builder
10+
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-bookworm AS backend-builder
1111
ARG TARGETPLATFORM
1212
RUN case "$TARGETPLATFORM" in \
1313
"linux/amd64") echo x86_64-unknown-linux-gnu > /rust_target.txt ;; \
@@ -17,9 +17,7 @@ RUN case "$TARGETPLATFORM" in \
1717
*) exit 1 ;; \
1818
esac
1919
RUN rustup target add $(cat /rust_target.txt)
20-
RUN apt update && apt install -y binutils-arm-linux-gnueabihf clang cmake gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf libc6-dev-i386 libcap2-bin libclang-dev musl-dev musl-tools
21-
RUN ln -s /usr/bin/arm-linux-gnueabihf-gcc /usr/bin/arm-linux-musleabihf-gcc
22-
RUN ln -s /usr/bin/aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-musl-gcc
20+
RUN apt update && apt install -y clang cmake gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf libc6-dev-i386 libcap2-bin libclang-dev musl-dev musl-tools
2321
RUN ln -s /usr/include/asm-generic /usr/include/asm
2422

2523
# Create appuser

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,10 @@ unused-features analyze --bins --lib --tests && unused-features build-report --i
5555
```
5656
flutter run -d chrome --web-hostname atrium.127.0.0.1.nip.io --web-port 3000 --web-browser-flag "--unsafely-treat-insecure-origin-as-secure=http://atrium.127.0.0.1.nip.io:3000"
5757
```
58+
59+
### Regenerate the frontend
60+
61+
```
62+
mv frontend frontend_old
63+
flutter create --template=app --platforms="android,web" --description="Atrium's frontend app" --org="fr.ninico" --project-name="atrium" frontend
64+
```

backend/.cargo/config.toml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
[target.armv7-unknown-linux-musleabihf]
2-
linker = "arm-linux-gnueabihf-ld"
3-
41
[target.arm-unknown-linux-musleabihf]
5-
linker = "arm-linux-gnueabihf-ld"
2+
linker = "arm-linux-gnueabihf-gcc"
63

7-
[target.aarch64-unknown-linux-musl]
8-
linker = "aarch64-linux-gnu-gcc"
4+
[target.armv7-unknown-linux-gnueabihf]
5+
linker = "arm-linux-gnueabihf-gcc"
96

107
[target.aarch64-unknown-linux-gnu]
118
linker = "aarch64-linux-gnu-gcc"
12-
13-
[target.armv7-unknown-linux-gnueabihf]
14-
linker = "arm-linux-gnueabihf-gcc"

backend/Cargo.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,63 +13,63 @@ name = "atrium"
1313

1414
[dependencies]
1515
argon2 = { features = ["alloc", "password-hash"], default-features = false, version = "0.5.3" }
16-
async_zip = { features = ["deflate", "tokio"], default-features = false, version = "0.0.17" }
16+
async_zip = { features = ["deflate", "tokio"], default-features = false, version = "0.0.18" }
1717
async-stream = "0.3.6"
1818
async-walkdir = "2.1.0"
19-
aws-lc-rs = { version = "1.13.2", default-features = false, features = ["bindgen"] }
19+
aws-lc-rs = { version = "1.13.3", default-features = false, features = ["bindgen"] }
2020
axum = { version = "0.8.4", features = ["http2", "json", "query", "tokio"], default-features = false }
2121
axum-extra = { version = "0.10.1", features = ["cookie-private", "typed-header"], default-features = false }
2222
axum-server = { version = "0.7.2", default-features = false, features = ["tls-rustls"] }
2323
base64ct = { version = "1.8.0", features = ["alloc"] }
2424
chacha20poly1305 = { version = "0.10.1", features = ["stream"], default-features = false }
2525
chrono = { default-features = false, version = "0.4.41" }
26-
filetime = "0.2.25"
26+
filetime = "0.2.26"
2727
futures = { default-features = false, version = "0.3.31" }
2828
futures-util = { default-features = false, version = "0.3.31" }
2929
headers = "0.4.1"
3030
http = "1.3.1"
3131
http-body-util = "0.1.3"
32-
hyper = { version = "1.6.0", default-features = false }
33-
hyper-hickory = { version = "0.7.0", default-features = false, features = ["system-config"] }
32+
hyper = { version = "1.7.0", default-features = false }
33+
hyper-hickory = { version = "0.8.0", default-features = false, features = ["system-config", "tokio"] }
3434
hyper-rustls = { version = "0.27.7", features = ["aws-lc-rs", "http1", "http2", "tls12", "webpki-tokio"], default-features = false }
35-
hyper-util = { version = "0.1.15", features = ["client-legacy", "http1", "tokio"], default-features = false }
35+
hyper-util = { version = "0.1.16", features = ["client-legacy", "http1", "tokio"], default-features = false }
3636
jsonwebtoken-aws-lc = { version = "9.3.0", default-features = false }
3737
maxminddb = "0.26.0"
3838
mime_guess = { default-features = false, version = "2.0.5" }
3939
oauth2 = { version = "5.0.0", default-features = false }
40-
percent-encoding = { default-features = false, version = "2.3.1" }
41-
quick-xml = "0.38.0"
40+
percent-encoding = { default-features = false, version = "2.3.2" }
41+
quick-xml = "0.38.3"
4242
rand = { default-features = false, version = "0.9.2", features = ["os_rng"] }
4343
rcgen = { version = "0.14.3", default-features = false, optional = true, features = ["aws_lc_rs", "crypto", "pem"] }
44-
rustls = { default-features = false, version = "0.23.29", features = ["aws_lc_rs"] }
44+
rustls = { default-features = false, version = "0.23.31", features = ["aws_lc_rs"] }
4545
rustls-acme = { version = "0.14.0", features = ["aws-lc-rs", "axum", "webpki-roots"], default-features = false }
4646
rustls-pki-types = { version = "1.12.0" }
4747
serde = { version = "1.0.219", default-features = false }
48-
serde_json = { default-features = false, version = "1.0.141" }
48+
serde_json = { default-features = false, version = "1.0.143" }
4949
serde_yaml_ng = "0.10.0"
5050
sha2 = { default-features = false, version = "0.10.9" }
51-
sysinfo = { default-features = false, version = "0.36.1", features = ["disk", "system"] }
51+
sysinfo = { default-features = false, version = "0.37.0", features = ["disk", "system"] }
5252
time = { default-features = false, version = "0.3.41" }
53-
tokio = { version = "1.46.1", features = ["full"], default-features = false }
53+
tokio = { version = "1.47.1", features = ["full"], default-features = false }
5454
tokio-stream = { version = "0.1.17", default-features = false }
55-
tokio-util = { version = "0.7.15", default-features = false }
55+
tokio-util = { version = "0.7.16", default-features = false }
5656
tower = { default-features = false, version = "0.5.2", features = ["util"] }
5757
tower-http = { version = "0.6.6", features = ["fs"], default-features = false }
5858
tower-service = "0.3.3"
59-
tracing = { default-features = false, version = "0.1.41" }
59+
tracing = { default-features = false, version = "0.1.41", features = ["attributes"] }
6060
tracing-appender = "0.2.3"
6161
tracing-subscriber = { version = "0.3.19", features = ["ansi", "env-filter", "local-time"], default-features = false }
6262
trim-in-place = "0.1.7"
6363
urlencoding = "2.1.3"
64-
uuid = { version = "1.17.0", features = ["fast-rng", "v4"], default-features = false }
64+
uuid = { version = "1.18.0", features = ["fast-rng", "v4"], default-features = false }
6565

6666
[features]
6767
default = ["self_signed"]
6868
self_signed = ["dep:rcgen"]
6969

7070
[dev-dependencies]
71-
async-tungstenite = { version = "0.30.0", features = ["tokio-runtime"] }
72-
reqwest = { version = "0.12.22", default-features = false, features = ["cookies", "json", "native-tls", "stream"] }
71+
async-tungstenite = { version = "0.31.0", features = ["tokio-runtime"] }
72+
reqwest = { version = "0.12.23", default-features = false, features = ["cookies", "json", "native-tls", "stream"] }
7373
tungstenite = "0.27.0"
7474

7575
[profile.release_optimized]

0 commit comments

Comments
 (0)