gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-07-26 07:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'garage v2.1.0' (#1168) from rel-v2.1.0 into main-v2

Browse Source 
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1168
This commit is contained in:
Alex
2025-09-15 16:53:35 +00:00
parent df4721387c 006fb18aea
commit 4d8407dc0f
22 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+13 -13
View File
@@ -1294,7 +1294,7 @@ dependencies = [
[[package]]
name = "garage"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"assert-json-diff",
"async-trait",
@@ -1350,7 +1350,7 @@ dependencies = [
[[package]]
name = "garage_api_admin"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"argon2",
"async-trait",
@@ -1382,7 +1382,7 @@ dependencies = [
[[package]]
name = "garage_api_common"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"base64 0.21.7",
"bytes",
@@ -1415,7 +1415,7 @@ dependencies = [
[[package]]
name = "garage_api_k2v"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"base64 0.21.7",
"err-derive",
@@ -1438,7 +1438,7 @@ dependencies = [
[[package]]
name = "garage_api_s3"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"aes-gcm",
"async-compression",
@@ -1483,7 +1483,7 @@ dependencies = [
[[package]]
name = "garage_block"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"arc-swap",
"async-compression",
@@ -1507,7 +1507,7 @@ dependencies = [
[[package]]
name = "garage_db"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"err-derive",
"fjall",
@@ -1522,7 +1522,7 @@ dependencies = [
[[package]]
name = "garage_model"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"argon2",
"async-trait",
@@ -1550,7 +1550,7 @@ dependencies = [
[[package]]
name = "garage_net"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"arc-swap",
"bytes",
@@ -1575,7 +1575,7 @@ dependencies = [
[[package]]
name = "garage_rpc"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"arc-swap",
"async-trait",
@@ -1607,7 +1607,7 @@ dependencies = [
[[package]]
name = "garage_table"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"arc-swap",
"async-trait",
@@ -1628,7 +1628,7 @@ dependencies = [
[[package]]
name = "garage_util"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"arc-swap",
"async-trait",
@@ -1660,7 +1660,7 @@ dependencies = [
[[package]]
name = "garage_web"
version = "2.0.0"
version = "2.1.0"
dependencies = [
"err-derive",
"garage_api_common",
Cargo.toml
+12 -12
View File
@@ -24,18 +24,18 @@ default-members = ["src/garage"]
# Internal Garage crates
format_table = { version = "0.1.1", path = "src/format-table" }
garage_api_common = { version = "2.0.0", path = "src/api/common" }
garage_api_admin = { version = "2.0.0", path = "src/api/admin" }
garage_api_s3 = { version = "2.0.0", path = "src/api/s3" }
garage_api_k2v = { version = "2.0.0", path = "src/api/k2v" }
garage_block = { version = "2.0.0", path = "src/block" }
garage_db = { version = "2.0.0", path = "src/db", default-features = false }
garage_model = { version = "2.0.0", path = "src/model", default-features = false }
garage_net = { version = "2.0.0", path = "src/net" }
garage_rpc = { version = "2.0.0", path = "src/rpc" }
garage_table = { version = "2.0.0", path = "src/table" }
garage_util = { version = "2.0.0", path = "src/util" }
garage_web = { version = "2.0.0", path = "src/web" }
garage_api_common = { version = "2.1.0", path = "src/api/common" }
garage_api_admin = { version = "2.1.0", path = "src/api/admin" }
garage_api_s3 = { version = "2.1.0", path = "src/api/s3" }
garage_api_k2v = { version = "2.1.0", path = "src/api/k2v" }
garage_block = { version = "2.1.0", path = "src/block" }
garage_db = { version = "2.1.0", path = "src/db", default-features = false }
garage_model = { version = "2.1.0", path = "src/model", default-features = false }
garage_net = { version = "2.1.0", path = "src/net" }
garage_rpc = { version = "2.1.0", path = "src/rpc" }
garage_table = { version = "2.1.0", path = "src/table" }
garage_util = { version = "2.1.0", path = "src/util" }
garage_web = { version = "2.1.0", path = "src/web" }
k2v-client = { version = "0.0.4", path = "src/k2v-client" }
# External crates from crates.io
doc/api/garage-admin-v2.json
+7 -1
View File
@@ -12,7 +12,7 @@
"name": "AGPL-3.0",
"identifier": "AGPL-3.0"
},
"version": "v2.0.0"
"version": "v2.1.0"
},
"servers": [
{
@@ -4054,6 +4054,12 @@
"enum": [
"aliases"
]
},
{
"type": "string",
"enum": [
"clearResyncQueue"
]
}
]
},
doc/book/cookbook/real-world.md
+5 -5
View File
@@ -96,14 +96,14 @@ to store 2 TB of data in total.
## Get a Docker image
Our docker image is currently named `dxflrs/garage` and is stored on the [Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated).
We encourage you to use a fixed tag (eg. `v2.0.0`) and not the `latest` tag.
For this example, we will use the latest published version at the time of the writing which is `v2.0.0` but it's up to you
We encourage you to use a fixed tag (eg. `v2.1.0`) and not the `latest` tag.
For this example, we will use the latest published version at the time of the writing which is `v2.1.0` but it's up to you
to check [the most recent versions on the Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated).
For example:
```
sudo docker pull dxflrs/garage:v2.0.0
sudo docker pull dxflrs/garage:v2.1.0
```
## Deploying and configuring Garage
@@ -171,7 +171,7 @@ docker run \
-v /etc/garage.toml:/etc/garage.toml \
-v /var/lib/garage/meta:/var/lib/garage/meta \
-v /var/lib/garage/data:/var/lib/garage/data \
dxflrs/garage:v2.0.0
dxflrs/garage:v2.1.0
```
With this command line, Garage should be started automatically at each boot.
@@ -185,7 +185,7 @@ If you want to use `docker-compose`, you may use the following `docker-compose.y
version: "3"
services:
garage:
image: dxflrs/garage:v2.0.0
image: dxflrs/garage:v2.1.0
network_mode: "host"
restart: unless-stopped
volumes:
doc/book/quick-start/_index.md
+1 -1
View File
@@ -132,7 +132,7 @@ docker run \
-v /path/to/garage.toml:/etc/garage.toml \
-v /path/to/garage/meta:/var/lib/garage/meta \
-v /path/to/garage/data:/var/lib/garage/data \
dxflrs/garage:v2.0.0
dxflrs/garage:v2.1.0
```
Under Linux, you can substitute `--network host` for `-p 3900:3900 -p 3901:3901 -p 3902:3902 -p 3903:3903`
script/helm/garage/Chart.yaml
+2 -2
View File
@@ -2,8 +2,8 @@ apiVersion: v2
name: garage
description: S3-compatible object store for small self-hosted geo-distributed deployments
type: application
version: 0.9.0
appVersion: "v2.0.0"
version: 0.9.1
appVersion: "v2.1.0"
home: https://garagehq.deuxfleurs.fr/
icon: https://garagehq.deuxfleurs.fr/images/garage-logo.svg
script/helm/garage/README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# garage
![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.0](https://img.shields.io/badge/AppVersion-v2.0.0-informational?style=flat-square)
![Version: 0.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.1.0](https://img.shields.io/badge/AppVersion-v2.1.0-informational?style=flat-square)
S3-compatible object store for small self-hosted geo-distributed deployments
src/api/admin/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_api_admin"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/api/admin/openapi.rs
+1 -1
View File
@@ -818,7 +818,7 @@ impl Modify for SecurityAddon {
#[derive(OpenApi)]
#[openapi(
info(
version = "v2.0.0",
version = "v2.1.0",
title = "Garage administration API",
description = "Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks.
src/api/common/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_api_common"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/api/common/generic_server.rs
+1 -2
View File
@@ -34,7 +34,6 @@ use garage_util::metrics::{gen_trace_id, RecordDuration};
use garage_util::socket_address::UnixOrTCPSocketAddress;
use crate::helpers::{BoxBody, ErrorBody};
use crate::signature::payload::Authorization;
pub trait ApiEndpoint: Send + Sync + 'static {
fn name(&self) -> Cow<'static, str>;
@@ -63,7 +62,7 @@ pub trait ApiHandler: Send + Sync + 'static {
/// Returns the key id used to authenticate this request. The ID returned must be safe to
/// log.
fn key_id_from_request(&self, req: &Request<IncomingBody>) -> Option<String> {
fn key_id_from_request(&self, _req: &Request<IncomingBody>) -> Option<String> {
None
}
}
src/api/k2v/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_api_k2v"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/api/s3/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_api_s3"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/block/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_block"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/db/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_db"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/garage/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/model/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_model"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
@@ -45,4 +45,4 @@ default = [ "lmdb", "sqlite" ]
k2v = [ "garage_util/k2v" ]
lmdb = [ "garage_db/lmdb" ]
sqlite = [ "garage_db/sqlite" ]
fjall = [ "garage_db/fjall" ]
fjall = [ "garage_db/fjall" ]
src/net/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_net"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/rpc/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_rpc"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/table/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_table"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/util/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_util"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/web/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_web"
version = "2.0.0"
version = "2.1.0"
authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
edition = "2018"
license = "AGPL-3.0"