Skip to content

Commit d742fc5

Browse files
Use Silo for bundled object storage (#8023)
1 parent 032198c commit d742fc5

14 files changed

Lines changed: 94 additions & 30 deletions

File tree

‎.github/ci/minio/README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Buzz CI MinIO
22

33
`ghcr.io/block/buzz-minio:latest` contains MinIO and `mc` for the disposable
4-
Linux AMD64 CI runners. `docker-compose.ci.yml` selects it for both services;
5-
development and deployment defaults stay in `docker-compose.yml`.
4+
Linux AMD64 runners. Only the publisher smoke test selects it through
5+
`docker-compose.ci.yml`. Ordinary CI inherits the Silo pins from
6+
`docker-compose.yml`; the Helm install test inherits the chart defaults.
67

78
The **MinIO image** workflow builds only when its inputs change, or on a manual
89
dispatch. Pull requests build and smoke-test without publishing. On `main`, a
@@ -13,9 +14,10 @@ Once consumers adopt the override, ordinary CI only pulls it; there is no build
1314
fallback or dependency on the publisher. `latest` deliberately floats, and
1415
Compose always pulls it. Docker's pull output records the resolved digest.
1516

16-
The Dockerfile uses the same upstream releases as the development services,
17-
with checksummed official GitHub release binaries and a digest-pinned Alpine
18-
base. MinIO and `mc` are AGPL-3.0; their corresponding source is available at
17+
The Dockerfile pins upstream MinIO releases independently of the Silo images
18+
used by the development and deployment examples. It uses checksummed official
19+
GitHub release binaries and a digest-pinned Alpine base. MinIO and `mc` are
20+
AGPL-3.0; their corresponding source is available at
1921
the [MinIO release](https://github.com/minio/minio/tree/RELEASE.2025-09-07T16-13-09Z)
2022
and [mc release](https://github.com/minio/mc/tree/RELEASE.2025-08-13T08-35-41Z).
2123

‎.github/workflows/_ci-desktop.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ jobs:
122122
desktop-smoke-e2e:
123123
name: Desktop Smoke E2E (${{ matrix.shard }})
124124
runs-on: ubuntu-latest
125-
timeout-minutes: 30
125+
# Chromium dependency setup can take 10m; a serial smoke shard needs
126+
# ~25m. Leave time for the full suite and its reports to finish.
127+
timeout-minutes: 45
126128
if: github.event_name == 'push' || inputs.desktop || inputs.desktop_rust || inputs.rust
127129
strategy:
128130
fail-fast: false

‎.github/workflows/_ci-relay.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ jobs:
209209
--archive-file target/ci/postgres-tests.tar.zst
210210
211211
desktop-e2e-integration-shard:
212-
env:
213-
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
214212
name: Desktop E2E Integration (${{ matrix.shard }}/2)
215213
runs-on: ubuntu-latest
216214
timeout-minutes: 20
@@ -404,8 +402,6 @@ jobs:
404402
echo "Desktop E2E Integration shards passed"
405403
406404
backend-integration:
407-
env:
408-
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
409405
name: Backend Integration (relay e2e)
410406
runs-on: ubuntu-latest
411407
timeout-minutes: 20
@@ -576,8 +572,6 @@ jobs:
576572
if-no-files-found: ignore
577573

578574
relay-e2e:
579-
env:
580-
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
581575
name: Relay E2E
582576
runs-on: ubuntu-latest
583577
timeout-minutes: 20

‎.github/workflows/mesh-lifecycle.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ env:
4949

5050
jobs:
5151
lifecycle-smoke:
52-
env:
53-
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
5452
name: Relay-Driven Mesh Lifecycle Smoke
5553
runs-on: ubuntu-24.04
5654
timeout-minutes: 45

‎ARCHITECTURE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ Docker Compose provides the full local development stack. All services include h
900900
| Postgres | `postgres:17-alpine` | 5432 | Primary event store — events, channels, tokens, workflows, audit; full-text search (`search_tsv` GIN) |
901901
| Redis | `redis:7-alpine` | 6379 | Pub/sub fan-out, presence (SET EX), typing (sorted sets) |
902902
| Adminer | `adminer` | 8082 | DB web UI (dev only) |
903-
| MinIO | `quay.io/minio/minio` | 9000 (API), 9001 (console) | S3-compatible object storage (media) |
903+
| Silo (MinIO fork) | `pgsty/silo` | 9000 (API), 9001 (console) | S3-compatible object storage (media) |
904904
| Prometheus | `prom/prometheus` | 9090 | Metrics collection |
905905
906906
### Postgres Schema (key tables)

‎deploy/charts/buzz/README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ image:
3838
digest: sha256:<64-lowercase-hex-characters>
3939
```
4040
41+
Bundled object storage uses [Silo](https://silo.pgsty.com/download/), a maintained
42+
MinIO fork, with matching `pgsty/silo` and `pgsty/mc` release images pinned by
43+
multi-platform digest. Both images allow anonymous pulls and support Linux
44+
amd64 and arm64; the upstream Quay MinIO images no longer allow anonymous pulls.
45+
The existing `minio` names and `MINIO_*` settings remain compatible. Keep the
46+
Helm and Compose pins aligned when upgrading, and run Buzz's
47+
[object-store conformance probe](../../../docs/git-on-object-storage.md#conformance-admitting-a-backend-for-a3)
48+
against the new release before deploying it.
49+
50+
For an existing MinIO data volume, follow Silo's
51+
[migration guide](https://silo.pgsty.com/compatibility/migration/) and take a
52+
backup before upgrading. Replacing the container image upgrades the storage
53+
server as well as changing its registry.
54+
4155
## Production (GitOps)
4256

4357
The chart is designed for ArgoCD and Flux. Both render charts with `helm template`, in which mode Helm's `lookup` function returns empty — any chart-side `randAlphaNum` call would regenerate secrets on every sync. The chart-managed Secret path is **only** safe for `helm install` / `helm upgrade`.

‎deploy/charts/buzz/ci/quickstart-values.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ redis:
99
enabled: true
1010
minio:
1111
enabled: true
12-
image: ghcr.io/block/buzz-minio:latest
13-
mcImage: ghcr.io/block/buzz-minio:latest
1412
relayUrl: wss://buzz.test.local
1513
ownerPubkey: "0000000000000000000000000000000000000000000000000000000000000001"
1614
relay:

‎deploy/charts/buzz/values.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,14 @@ operatorJobs:
416416
cpu: "1"
417417
memory: 1Gi
418418

419-
# In-cluster MinIO for the quickstart profile only. Production deploys leave
419+
# In-cluster Silo (MinIO fork) for the quickstart profile only. Production deploys leave
420420
# this disabled and use s3.* (or secrets.existingSecret) against managed S3.
421421
minio:
422-
enabled: false # quickstart: set true for bundled in-cluster MinIO
423-
image: quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z@sha256:14cea493d9a34af32f524e538b8346cf79f3321eff8e708c1e2960462bd8936e
424-
mcImage: quay.io/minio/mc:RELEASE.2025-08-13T08-35-41Z@sha256:a7fe349ef4bd8521fb8497f55c6042871b2ae640607cf99d9bede5e9bdf11727
422+
enabled: false # quickstart: set true for bundled in-cluster Silo
423+
# Silo is a maintained MinIO fork with public amd64/arm64 images.
424+
# Keep the matching server/client release and digest pins aligned with Compose.
425+
image: pgsty/silo:RELEASE.2026-09-16T00-00-00Z@sha256:635197cb9f36d01bee221d34d1c7d7960f6a95c48b0b6c01d99cd13bdae51a46
426+
mcImage: pgsty/mc:RELEASE.2026-09-16T00-00-00Z@sha256:cfc83108c3abb371f8fb84d99c1fdc88f8c237e022409b0081fb7c0a3be634dd
425427
persistence:
426428
enabled: true
427429
size: 10Gi

‎deploy/compose/README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,20 @@ keypair.
5050

5151
Run `./run.sh backup-hint` for the backup checklist.
5252

53+
Bundled object storage uses [Silo](https://silo.pgsty.com/download/), a maintained
54+
MinIO fork, with matching `pgsty/silo` and `pgsty/mc` release images pinned by
55+
multi-platform digest. Both images allow anonymous pulls and support Linux
56+
amd64 and arm64; the upstream Quay MinIO images no longer allow anonymous pulls.
57+
The existing `minio` names and `MINIO_*` settings remain compatible. Keep the
58+
Helm and Compose pins aligned when upgrading, and run Buzz's
59+
[object-store conformance probe](../../docs/git-on-object-storage.md#conformance-admitting-a-backend-for-a3)
60+
against the new release before deploying it.
61+
62+
For an existing MinIO data volume, follow Silo's
63+
[migration guide](https://silo.pgsty.com/compatibility/migration/) and take a
64+
backup before upgrading. Replacing the container image upgrades the storage
65+
server as well as changing its registry.
66+
5367
## Validation
5468

5569
Before sharing an install link publicly, verify a fresh install with:

‎deploy/compose/compose.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ services:
8585
- buzz-net
8686

8787
minio:
88-
image: quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z@sha256:14cea493d9a34af32f524e538b8346cf79f3321eff8e708c1e2960462bd8936e
88+
# Silo preserves the MinIO configuration and health endpoints.
89+
image: pgsty/silo:RELEASE.2026-09-16T00-00-00Z@sha256:635197cb9f36d01bee221d34d1c7d7960f6a95c48b0b6c01d99cd13bdae51a46
8990
command: server /data --console-address ":9001"
9091
environment:
9192
MINIO_ROOT_USER: ${BUZZ_S3_ACCESS_KEY:?set BUZZ_S3_ACCESS_KEY}
@@ -103,7 +104,7 @@ services:
103104
- buzz-net
104105

105106
minio-init:
106-
image: quay.io/minio/mc:RELEASE.2025-08-13T08-35-41Z@sha256:a7fe349ef4bd8521fb8497f55c6042871b2ae640607cf99d9bede5e9bdf11727
107+
image: pgsty/mc:RELEASE.2026-09-16T00-00-00Z@sha256:cfc83108c3abb371f8fb84d99c1fdc88f8c237e022409b0081fb7c0a3be634dd
107108
depends_on:
108109
minio:
109110
condition: service_healthy

0 commit comments

Comments
 (0)