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 v1.2.0' (#1068) from rel-1.2.0 into main

Browse Source 
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1068
This commit is contained in:
Alex
2025-06-13 16:12:29 +00:00
parent 9eb07d4c7b 3a4afc04a9
commit 3f4ab3a4a3
21 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+15 -15
View File
@@ -867,9 +867,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.14"
version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
dependencies = [
"crossbeam-utils",
]
@@ -1200,7 +1200,7 @@ dependencies = [
[[package]]
name = "garage"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"assert-json-diff",
"async-trait",
@@ -1256,7 +1256,7 @@ dependencies = [
[[package]]
name = "garage_api_admin"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"argon2",
"async-trait",
@@ -1282,7 +1282,7 @@ dependencies = [
[[package]]
name = "garage_api_common"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"base64 0.21.7",
"bytes",
@@ -1316,7 +1316,7 @@ dependencies = [
[[package]]
name = "garage_api_k2v"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"base64 0.21.7",
"err-derive",
@@ -1339,7 +1339,7 @@ dependencies = [
[[package]]
name = "garage_api_s3"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"aes-gcm",
"async-compression",
@@ -1384,7 +1384,7 @@ dependencies = [
[[package]]
name = "garage_block"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"arc-swap",
"async-compression",
@@ -1409,7 +1409,7 @@ dependencies = [
[[package]]
name = "garage_db"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"err-derive",
"heed",
@@ -1422,7 +1422,7 @@ dependencies = [
[[package]]
name = "garage_model"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"async-trait",
"base64 0.21.7",
@@ -1449,7 +1449,7 @@ dependencies = [
[[package]]
name = "garage_net"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"arc-swap",
"bytes",
@@ -1474,7 +1474,7 @@ dependencies = [
[[package]]
name = "garage_rpc"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"arc-swap",
"async-trait",
@@ -1506,7 +1506,7 @@ dependencies = [
[[package]]
name = "garage_table"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"arc-swap",
"async-trait",
@@ -1527,7 +1527,7 @@ dependencies = [
[[package]]
name = "garage_util"
version = "1.1.0"
version = "1.2.0"
dependencies = [
"arc-swap",
"async-trait",
@@ -1559,7 +1559,7 @@ dependencies = [
[[package]]
name = "garage_web"
version = "1.1.0"
version = "1.2.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 = "1.1.0", path = "src/api/common" }
garage_api_admin = { version = "1.1.0", path = "src/api/admin" }
garage_api_s3 = { version = "1.1.0", path = "src/api/s3" }
garage_api_k2v = { version = "1.1.0", path = "src/api/k2v" }
garage_block = { version = "1.1.0", path = "src/block" }
garage_db = { version = "1.1.0", path = "src/db", default-features = false }
garage_model = { version = "1.1.0", path = "src/model", default-features = false }
garage_net = { version = "1.1.0", path = "src/net" }
garage_rpc = { version = "1.1.0", path = "src/rpc" }
garage_table = { version = "1.1.0", path = "src/table" }
garage_util = { version = "1.1.0", path = "src/util" }
garage_web = { version = "1.1.0", path = "src/web" }
garage_api_common = { version = "1.2.0", path = "src/api/common" }
garage_api_admin = { version = "1.2.0", path = "src/api/admin" }
garage_api_s3 = { version = "1.2.0", path = "src/api/s3" }
garage_api_k2v = { version = "1.2.0", path = "src/api/k2v" }
garage_block = { version = "1.2.0", path = "src/block" }
garage_db = { version = "1.2.0", path = "src/db", default-features = false }
garage_model = { version = "1.2.0", path = "src/model", default-features = false }
garage_net = { version = "1.2.0", path = "src/net" }
garage_rpc = { version = "1.2.0", path = "src/rpc" }
garage_table = { version = "1.2.0", path = "src/table" }
garage_util = { version = "1.2.0", path = "src/util" }
garage_web = { version = "1.2.0", path = "src/web" }
k2v-client = { version = "0.0.4", path = "src/k2v-client" }
# External crates from crates.io
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. `v1.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 `v1.1.0` but it's up to you
We encourage you to use a fixed tag (eg. `v1.2.0`) and not the `latest` tag.
For this example, we will use the latest published version at the time of the writing which is `v1.2.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:v1.1.0
sudo docker pull dxflrs/garage:v1.2.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:v1.1.0
dxflrs/garage:v1.2.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:v1.1.0
image: dxflrs/garage:v1.2.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:v1.1.0
dxflrs/garage:v1.2.0
```
Under Linux, you can substitute `--network host` for `-p 3900:3900 -p 3901:3901 -p 3902:3902 -p 3903:3903`
doc/book/reference-manual/configuration.md
+3 -3
View File
@@ -153,14 +153,14 @@ The `[admin]` section:
### Environment variables {#env_variables}
The following configuration parameter must be specified as an environment
variable, it does not exist in the configuration file:
The following configuration parameters must be specified as environment variables,
they do not exist in the configuration file:
- `GARAGE_LOG_TO_SYSLOG` (since `v0.9.4`): set this to `1` or `true` to make the
Garage daemon send its logs to `syslog` (using the libc `syslog` function)
instead of printing to stderr.
- `GARAGE_LOG_TO_JOURNALD` (since `v2.0.0`): set this to `1` or `true` to make the
- `GARAGE_LOG_TO_JOURNALD` (since `v1.2.0`): set this to `1` or `true` to make the
Garage daemon send its logs to `journald` (using the native protocol of `systemd-journald`)
instead of printing to stderr.
doc/drafts/admin-api.md
+1 -1
View File
@@ -70,7 +70,7 @@ Example response body:
```json
{
"node": "b10c110e4e854e5aa3f4637681befac755154b20059ec163254ddbfae86b09df",
"garageVersion": "v1.1.0",
"garageVersion": "v1.2.0",
"garageFeatures": [
"k2v",
"lmdb",
script/helm/garage/Chart.yaml
+3 -3
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.7.0
appVersion: "v1.1.0"
version: 0.7.1
appVersion: "v1.2.0"
home: https://garagehq.deuxfleurs.fr/
icon: https://garagehq.deuxfleurs.fr/images/garage-logo.svg
@@ -15,4 +15,4 @@ keywords:
sources:
- https://git.deuxfleurs.fr/Deuxfleurs/garage.git
maintainers: []
maintainers: []
script/helm/garage/README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# garage
![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.2.0](https://img.shields.io/badge/AppVersion-v1.2.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 = "1.1.0"
version = "1.2.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/api/common/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_api_common"
version = "1.1.0"
version = "1.2.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/api/k2v/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_api_k2v"
version = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/model/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_model"
version = "1.1.0"
version = "1.2.0"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
src/net/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "garage_net"
version = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.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 = "1.1.0"
version = "1.2.0"
authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
edition = "2018"
license = "AGPL-3.0"