Skip to content

Commit bc235eb

Browse files
authored
Merge pull request #46 from DioCrafts/feature/dev-bug-fixed
Feature/dev bug fixed
2 parents 9e73d50 + 2463e85 commit bc235eb

19 files changed

+346
-124
lines changed

Cargo.lock

+83-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ edition = "2021"
55

66

77
[dependencies]
8-
axum = { version = "0.8.1", features = ["multipart", "http1", "tokio", "macros"] }
9-
tokio = { version = "1.44.1", features = ["full"] }
8+
axum = { version = "0.8.3", features = ["multipart", "http1", "tokio", "macros"] }
9+
tokio = { version = "1.44.2", features = ["full"] }
1010
tokio-util = { version = "0.7.14", features = ["io", "codec"] }
1111
tokio-stream = { version = "0.1.17", features = ["fs"] }
1212
bytes = "1.10.1"
1313
tempfile = "3.19.1"
1414
tower = "0.5.2"
1515
tower-http = { version = "0.6.2", features = ["fs", "compression-gzip", "trace", "cors", "add-extension", "request-id"] }
16-
flate2 = "1.1.0"
17-
zip = "2.5.0"
16+
flate2 = "1.1.1"
17+
zip = "2.6.1"
1818
tracing = "0.1.41"
1919
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
2020
chrono = { version = "0.4.40", features = ["serde"] }
@@ -39,9 +39,10 @@ rand_core = { version = "0.6.4", features = ["std"] }
3939
time = "0.3.41"
4040
axum-server = "0.6.0"
4141
hyper = { version = "1.6.0", features = ["full"] }
42-
url = "2.5.0"
42+
url = "2.5.4"
4343
quick-xml = "0.30.0"
4444
http-body-util = "0.1.3"
45+
openssl = { version = "0.10.72", features = ["vendored"] }
4546

4647
[features]
4748
default = []

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM rust:1.85-alpine AS cacher
33
WORKDIR /app
44
RUN apk --no-cache upgrade && \
5-
apk add --no-cache musl-dev openssl-dev pkgconfig postgresql-dev
5+
apk add --no-cache musl-dev pkgconfig postgresql-dev gcc perl make
66
COPY Cargo.toml Cargo.lock ./
77
# Create a minimal project to download and cache dependencies
88
RUN mkdir -p src && \
@@ -14,7 +14,7 @@ RUN mkdir -p src && \
1414
FROM rust:1.85-alpine AS builder
1515
WORKDIR /app
1616
RUN apk --no-cache upgrade && \
17-
apk add --no-cache musl-dev openssl-dev pkgconfig postgresql-dev
17+
apk add --no-cache musl-dev pkgconfig postgresql-dev gcc perl make
1818
# Copy cached dependencies
1919
COPY --from=cacher /app/target target
2020
COPY --from=cacher /usr/local/cargo /usr/local/cargo
@@ -30,7 +30,7 @@ RUN cargo build --release
3030
FROM alpine:3.21.3
3131
# Install only necessary runtime dependencies and update packages
3232
RUN apk --no-cache upgrade && \
33-
apk add --no-cache libgcc openssl ca-certificates libpq tzdata
33+
apk add --no-cache libgcc ca-certificates libpq tzdata
3434

3535
# Copy only the compiled binary
3636
COPY --from=builder /app/target/release/oxicloud /usr/local/bin/

0 commit comments

Comments
 (0)