diff --git a/Dockerfile b/Dockerfile index f4940e3..b556f22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ FROM archlinux RUN pacman -Syu --noconfirm openssl-1.1 tar xz zstd curl base-devel git rsync -COPY --from=builder /app/target/release/pacco /pacco +COPY --from=builder /app/target/release/pacco /usr/bin/pacco WORKDIR / -CMD ["/pacco", "serve", "/config.toml"] +CMD ["/usr/bin/pacco", "serve", "/config.toml"] diff --git a/src/main.rs b/src/main.rs index 5ee4485..edd3777 100644 --- a/src/main.rs +++ b/src/main.rs @@ -56,20 +56,23 @@ async fn launch(config: String) { ..Default::default() }) .mount_assets() - .mount("/", routes![ - routes::index_page, - routes::pkg_route, - routes::push::upload_pkg, - routes::user::login, - routes::user::login_post, - routes::user::account_page, - routes::ui::pkg_ui, - routes::ui::repo_ui, - routes::user::new_api_key, - routes::user::end_session, - routes::user::change_password, - routes::user::change_password_post - ]) + .mount( + "/", + routes![ + routes::index_page, + routes::pkg_route, + routes::push::upload_pkg, + routes::user::login, + routes::user::login_post, + routes::user::account_page, + routes::ui::pkg_ui, + routes::ui::repo_ui, + routes::user::new_api_key, + routes::user::end_session, + routes::user::change_password, + routes::user::change_password_post + ], + ) .manage(config) .manage(shell) .launch()