From 04715b00364065d9658fc0d04c1eb56a961599bd Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Tue, 9 Jul 2024 17:46:38 +0200 Subject: [PATCH 1/4] chore: chmod binary in dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 24031b3..e1e5a96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ COPY . . RUN curl \ --fail \ -o rieterd \ - "https://s3.rustybever.be/rieter/commits/${CI_COMMIT_SHA}/rieterd-$(echo "${TARGETPLATFORM}" | sed 's:/:-:g')" + "https://s3.rustybever.be/rieter/commits/${CI_COMMIT_SHA}/rieterd-$(echo "${TARGETPLATFORM}" | sed 's:/:-:g')" && \ + chmod +x rieterd FROM alpine:3.19 From 777d57512e2da821754c3203e7140df9aa8f956c Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Tue, 9 Jul 2024 20:44:31 +0200 Subject: [PATCH 2/4] chore(repo): remove package removal route for now --- CHANGELOG.md | 18 ++++++++---------- server/src/web/repo.rs | 34 ++-------------------------------- 2 files changed, 10 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9f4871..63ec9e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -* Server - * Functional repository server - * Serve packages from any number of repositories & architectures - * Publish packages to and delete packages from repositories using HTTP - requests - * Packages of architecture "any" are part of every architecture's - database - * Bearer authentication for private routes - * REST API - * Repository & package information available using JSON REST API +* Functional repository server + * Supports any number of repositories, grouped into distros, each + supporting any number of architectures + * Repository & package information available using JSON REST API + * Queueing system with configurable number of workers for resilient + concurrency +* TOML configuration file +* SQLite & Postgres support diff --git a/server/src/web/repo.rs b/server/src/web/repo.rs index e1bc61a..84d80ca 100644 --- a/server/src/web/repo.rs +++ b/server/src/web/repo.rs @@ -5,7 +5,7 @@ use axum::{ extract::{Path, State}, http::{Request, StatusCode}, response::IntoResponse, - routing::{delete, post}, + routing::{delete, get, post}, Router, }; use futures::TryStreamExt; @@ -27,12 +27,7 @@ pub fn router(api_key: &str) -> Router { ) // Routes added after the layer do not get that layer applied, so the GET requests will not // be authorized - .route( - "/:distro/:repo/:arch/:filename", - delete(delete_package) - .route_layer(ValidateRequestHeaderLayer::bearer(api_key)) - .get(get_file), - ) + .route("/:distro/:repo/:arch/:filename", get(get_file)) } /// Serve the package archive files and database archives. If files are requested for an @@ -129,28 +124,3 @@ async fn delete_arch_repo( Ok(StatusCode::NOT_FOUND) } } - -async fn delete_package( - State(_global): State, - Path((_distro, _repo, _arch, _pkg_name)): Path<(String, String, String, String)>, -) -> crate::Result { - Ok(StatusCode::NOT_FOUND) - //if let Some(mgr) = global.mgr.get_mgr(&distro).await { - // let pkg_removed = mgr.remove_pkg(&repo, &arch, &pkg_name).await?; - // - // if pkg_removed { - // tracing::info!( - // "Removed package '{}' ({}) from repository '{}'", - // pkg_name, - // arch, - // repo - // ); - // - // Ok(StatusCode::OK) - // } else { - // Ok(StatusCode::NOT_FOUND) - // } - //} else { - // Ok(StatusCode::NOT_FOUND) - //} -} From 2c4b9e545292f9665436c3869b82142e0f7efa9e Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 9 Jul 2024 20:58:25 +0200 Subject: [PATCH 3/4] feat(ci): add release docker build --- .woodpecker/docker.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml index 214df4b..edba80c 100644 --- a/.woodpecker/docker.yml +++ b/.woodpecker/docker.yml @@ -25,3 +25,19 @@ steps: when: branch: dev event: push + + release: + image: 'woodpeckerci/plugin-docker-buildx' + secrets: + - 'docker_username' + - 'docker_password' + settings: + registry: 'git.rustybever.be' + repo: 'git.rustybever.be/chewing_bever/rieter' + auto_tag: true + platforms: [ 'linux/amd64' ] + build_args_from_env: + - 'CI_COMMIT_SHA' + mtu: 1300 + when: + event: tag From fbdb182f50410984c2199e00a0fd485467672373 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 9 Jul 2024 21:02:07 +0200 Subject: [PATCH 4/4] chore: update changelog for 0.1.0 --- .woodpecker/build-rel.yml | 3 --- CHANGELOG.md | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build-rel.yml b/.woodpecker/build-rel.yml index b4b7067..faadd85 100644 --- a/.woodpecker/build-rel.yml +++ b/.woodpecker/build-rel.yml @@ -24,9 +24,6 @@ steps: secrets: - minio_access_key - minio_secret_key - when: - branch: dev - event: push publish-rel: image: 'curlimages/curl' diff --git a/CHANGELOG.md b/CHANGELOG.md index 63ec9e4..79a40d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://git.rustybever.be/Chewing_Bever/rieter/src/branch/dev) +## [0.1.0](https://git.rustybever.be/Chewing_Bever/rieter/src/tag/0.1.0) + ### Added * Functional repository server