diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index c2e0529..bf0bc67 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -6,7 +6,7 @@ steps: - name: build image: woodpeckerci/plugin-docker-buildx settings: - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 repo: git.hydrar.de/jmarya/pacco registry: git.hydrar.de tags: latest diff --git a/Dockerfile b/Dockerfile index b556f22..828a565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /app RUN cargo build --release -FROM archlinux +FROM git.hydrar.de/navos/navos:latest RUN pacman -Syu --noconfirm openssl-1.1 tar xz zstd curl base-devel git rsync diff --git a/src/main.rs b/src/main.rs index 20cd139..ea73c2c 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()