diff --git a/Dockerfile b/Dockerfile index 86990a3..82f54ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ WORKDIR /usr/src/warren COPY backend/Cargo.toml backend/Cargo.lock ./ RUN mkdir -p src/bin/backend && mkdir src/lib && echo "fn main() {}" > src/bin/backend/main.rs && echo "" > src/lib/lib.rs -RUN apk add --no-cache pkgconfig openssl-dev libc-dev +RUN apk add --no-cache pkgconfig openssl openssl-dev libc-dev openssl-libs-static RUN cargo build --release COPY backend/ . RUN touch src/bin/backend/main.rs && touch src/lib/lib.rs diff --git a/backend/Cargo.toml b/backend/Cargo.toml index c7c21dc..829a79b 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -29,7 +29,13 @@ regex = "1.11.1" rustix = { version = "1.0.8", features = ["fs"] } serde = { version = "1.0.219", features = ["derive"] } serde_json = "1.0.140" -sqlx = { version = "0.8.6", features = ["chrono", "postgres", "runtime-tokio", "time", "uuid"] } +sqlx = { version = "0.8.6", features = [ + "chrono", + "postgres", + "runtime-tokio", + "time", + "uuid", +] } thiserror = "2.0.12" tokio = { version = "1.46.1", features = ["full"] } tokio-util = "0.7.15" diff --git a/backend/src/lib/domain/warren/models/file/requests/save.rs b/backend/src/lib/domain/warren/models/file/requests/save.rs index e31eee0..6d08ab2 100644 --- a/backend/src/lib/domain/warren/models/file/requests/save.rs +++ b/backend/src/lib/domain/warren/models/file/requests/save.rs @@ -16,11 +16,11 @@ impl<'s> SaveRequest<'s> { &self.path } - pub fn stream(&self) -> &'s UploadFileStream { + pub fn stream(&self) -> &UploadFileStream<'s> { &self.stream } - pub fn stream_mut(&mut self) -> &'s mut UploadFileStream { + pub fn stream_mut(&mut self) -> &mut UploadFileStream<'s> { &mut self.stream } diff --git a/compose.yaml b/compose.yaml index 6a06185..74641f1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -16,7 +16,7 @@ services: - 'DATABASE_URL=postgres://postgres:pg@warren-postgres:5432' - 'DATABASE_NAME=warren' - 'SERVE_DIRECTORY=/serve' - - 'CORS_ALLOW_ORIGIN=http://localhost:3000' + - 'CORS_ALLOW_ORIGIN=http://localhost:8081' - 'LOG_LEVEL=debug' volumes: - './backend/serve:/serve:rw'