diff --git a/Cargo.toml b/Cargo.toml index f489ccbf..cd2ceb94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dragonfly-client" -version = "0.1.4" +version = "0.1.5" authors = ["The Dragonfly Developers"] homepage = "https://d7y.io/" repository = "https://github.com/dragonflyoss/client.git" diff --git a/Dockerfile b/Dockerfile index 211c6ad1..331d2891 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG BASE_IMAGE=alpine:3.17 +ARG BASE_IMAGE=rust -FROM rust as builder +FROM ${BASE_IMAGE} as builder RUN apt-get update && apt-get install -y openssl libclang-dev pkg-config protobuf-compiler @@ -9,7 +9,7 @@ COPY Cargo.toml ./ COPY src/ src/ RUN cargo build --release -FROM ${BASE_IMAGE} as health +FROM alpine:3.17 as health ENV GRPC_HEALTH_PROBE_VERSION v0.4.24 @@ -29,4 +29,4 @@ COPY --from=builder /app/client/target/release/dfdaemon /usr/local/bin/dfdaemon COPY --from=builder /app/client/target/release/dfstore /usr/local/bin/dfstore COPY --from=health /bin/grpc_health_probe /bin/grpc_health_probe -ENTRYPOINT ["dfdaemon"] +ENTRYPOINT ["/usr/local/bin/dfdaemon"] diff --git a/src/bin/dfdaemon/main.rs b/src/bin/dfdaemon/main.rs index ac52b2e6..6678d0c7 100644 --- a/src/bin/dfdaemon/main.rs +++ b/src/bin/dfdaemon/main.rs @@ -91,12 +91,11 @@ async fn main() -> Result<(), anyhow::Error> { let args = Args::parse(); // Load config. - let config = dfdaemon::Config::load(&args.config)?; + let config = dfdaemon::Config::load(&args.config).map_err(|err| { + error!("load config failed: {}", err); + err + })?; let config = Arc::new(config); - println!( - "socket path: {:?}", - config.download.server.socket_path.clone() - ); // Initialize tracing. let _guards = init_tracing(