Merge origin/main into claude/upbeat-wright-btruto
Resolves the four-file conflict with PR #444, which landed a parallel implementation of the same batch-fsync design (unsynced chunk writes plus one sync_blobs durability barrier). Both sides converged on identical trait signatures; main's version is kept for all overlapping code since it is already merged and carries unit tests: - blob_storage_ports.rs: doc-comment-only conflict, main's docs kept - dedup_service.rs: main's pipeline kept. The naive textual merge would have retained BOTH durability-barrier/INSERT blocks, double-counting ref_count for every new chunk; the duplicated block from this branch is dropped - encrypted_blob_backend.rs, local_blob_backend.rs: main's implementations kept (fsync_paths_parallel + tests); this branch's equivalent helpers (fsync_dir, fsync_blob_file, SYNC_BLOBS_CONCURRENCY) are referenced nowhere else and are dropped Everything unique to this branch (streaming PROPFIND, range requests, batch ID resolution, CalDAV/CardDAV indexed lookups, transcode and breadcrumb changes) merges cleanly and is unchanged. https://claude.ai/code/session_01GpprjxjtXFYLfXNkoKnHuL
This commit is contained in:
+7
-3
@@ -1,7 +1,10 @@
|
||||
# ─── Stage 1: Shared build base (avoids duplicate apk install) ────────────────
|
||||
FROM rust:1.94.1-alpine3.23 AS base
|
||||
# sqlx's postgres driver speaks the wire protocol in pure Rust (no pq-sys in
|
||||
# Cargo.lock) and TLS goes through rustls, so libpq headers are never needed at
|
||||
# build time. perl/make/gcc/musl-dev remain for the C builds of aws-lc-sys.
|
||||
RUN apk --no-cache upgrade && \
|
||||
apk add --no-cache musl-dev pkgconfig postgresql-dev gcc perl make
|
||||
apk add --no-cache musl-dev pkgconfig gcc perl make
|
||||
|
||||
# ─── Stage 2: Cache dependencies ─────────────────────────────────────────────
|
||||
FROM base AS cacher
|
||||
@@ -49,9 +52,10 @@ LABEL org.opencontainers.image.title="OxiCloud" \
|
||||
org.opencontainers.image.licenses="MIT"
|
||||
|
||||
# Install only necessary runtime dependencies and update packages
|
||||
# su-exec is needed by the entrypoint to drop privileges after fixing volume permissions
|
||||
# su-exec is needed by the entrypoint to drop privileges after fixing volume permissions.
|
||||
# No libpq: the pure-Rust sqlx postgres driver never links it.
|
||||
RUN apk --no-cache upgrade && \
|
||||
apk add --no-cache libgcc ca-certificates libpq tzdata su-exec && \
|
||||
apk add --no-cache libgcc ca-certificates tzdata su-exec && \
|
||||
addgroup -g 1001 -S oxicloud && \
|
||||
adduser -u 1001 -S oxicloud -G oxicloud
|
||||
|
||||
|
||||
Reference in New Issue
Block a user