This commit is contained in:
parent
6fa01228c0
commit
cf5f641012
1 changed files with 22 additions and 17 deletions
15
src/main.rs
15
src/main.rs
|
@ -56,9 +56,7 @@ async fn launch(config: String) {
|
||||||
..Default::default()
|
..Default::default()
|
||||||
})
|
})
|
||||||
.mount_assets()
|
.mount_assets()
|
||||||
.mount(
|
.mount("/", routes![
|
||||||
"/",
|
|
||||||
routes![
|
|
||||||
routes::index_page,
|
routes::index_page,
|
||||||
routes::pkg_route,
|
routes::pkg_route,
|
||||||
routes::push::upload_pkg,
|
routes::push::upload_pkg,
|
||||||
|
@ -71,8 +69,7 @@ async fn launch(config: String) {
|
||||||
routes::user::end_session,
|
routes::user::end_session,
|
||||||
routes::user::change_password,
|
routes::user::change_password,
|
||||||
routes::user::change_password_post
|
routes::user::change_password_post
|
||||||
],
|
])
|
||||||
)
|
|
||||||
.manage(config)
|
.manage(config)
|
||||||
.manage(shell)
|
.manage(shell)
|
||||||
.launch()
|
.launch()
|
||||||
|
@ -114,6 +111,14 @@ pub fn build(image: &str, ci: bool) {
|
||||||
"chown -R build /build".to_string(),
|
"chown -R build /build".to_string(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
if ci {
|
||||||
|
let chown_cmd = format!(
|
||||||
|
"chown -R build {}",
|
||||||
|
std::env::current_dir().unwrap().display()
|
||||||
|
);
|
||||||
|
docker_script.extend([chown_cmd]);
|
||||||
|
}
|
||||||
|
|
||||||
if ci {
|
if ci {
|
||||||
if std::fs::exists("./pacman.conf").unwrap() {
|
if std::fs::exists("./pacman.conf").unwrap() {
|
||||||
println!("-> Using custom pacman.conf");
|
println!("-> Using custom pacman.conf");
|
||||||
|
|
Loading…
Add table
Reference in a new issue