From 28e4dd5b5844eca5907daf5fe9d3173f37db7375 Mon Sep 17 00:00:00 2001 From: kieran Date: Tue, 12 Nov 2024 10:38:22 +0000 Subject: [PATCH] chore: run version command on build --- Dockerfile | 7 ++++--- src/bin/main.rs | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4628efe..2bc5ca1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE=rust:bookworm ARG FEATURES -FROM $IMAGE as build +FROM $IMAGE AS build WORKDIR /app/src COPY src src COPY migrations migrations @@ -34,12 +34,12 @@ RUN git clone --single-branch --branch release/7.1 https://git.v0l.io/ffmpeg/FFm make -j$(nproc) install RUN cargo install --path . --root /app/build --features "${FEATURES}" -FROM node:bookworm as ui_builder +FROM node:bookworm AS ui_builder WORKDIR /app/src COPY ui_src . RUN yarn && yarn build -FROM $IMAGE as runner +FROM $IMAGE AS runner WORKDIR /app RUN apt update && \ apt install -y libx264-164 libwebp7 libvpx7 && \ @@ -47,4 +47,5 @@ RUN apt update && \ COPY --from=build /app/build . COPY --from=ui_builder /app/src/dist ui COPY --from=build /app/ffmpeg/lib/ /lib +RUN ./bin/route96 --version ENTRYPOINT ["./bin/route96"] \ No newline at end of file diff --git a/src/bin/main.rs b/src/bin/main.rs index 3d512f7..f32be2e 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -31,6 +31,8 @@ struct Args { async fn main() -> Result<(), Error> { pretty_env_logger::init(); + let _args: Args = Args::parse(); + let builder = Config::builder() .add_source(config::File::with_name("config.toml")) .add_source(config::Environment::with_prefix("APP")) @@ -40,8 +42,6 @@ async fn main() -> Result<(), Error> { let db = Database::new(&settings.database).await?; - let _args: Args = Args::parse(); - info!("Running DB migration"); db.migrate().await?;