End of forgejo-registry-consolidation. After Phase 0/1 already landed
(Forgejo ready, dual-push CI, integrity probe, retention CronJob,
images migrated via forgejo-migrate-orphan-images.sh), this commit
flips everything off registry.viktorbarzin.me onto Forgejo and
removes the legacy infrastructure.
Phase 3 — image= flips:
* infra/stacks/{payslip-ingest,job-hunter,claude-agent-service,
fire-planner,freedify/factory,chrome-service,beads-server}/main.tf
— image= now points to forgejo.viktorbarzin.me/viktor/<name>.
* infra/stacks/claude-memory/main.tf — also moved off DockerHub
(viktorbarzin/claude-memory-mcp:17 → forgejo.viktorbarzin.me/viktor/...).
* infra/.woodpecker/{default,drift-detection}.yml — infra-ci pulled
from Forgejo. build-ci-image.yml dual-pushes still until next
build cycle confirms Forgejo as canonical.
* /home/wizard/code/CLAUDE.md — claude-memory-mcp install URL updated.
Phase 4 — decommission registry-private:
* registry-credentials Secret: dropped registry.viktorbarzin.me /
registry.viktorbarzin.me:5050 / 10.0.20.10:5050 auths entries.
Forgejo entry is the only one left.
* infra/stacks/infra/main.tf cloud-init: dropped containerd
hosts.toml entries for registry.viktorbarzin.me +
10.0.20.10:5050. (Existing nodes already had the file removed
manually by `setup-forgejo-containerd-mirror.sh` rollout — the
cloud-init template only fires on new VM provision.)
* infra/modules/docker-registry/docker-compose.yml: registry-private
service block removed; nginx 5050 port mapping dropped. Pull-
through caches for upstream registries (5000/5010/5020/5030/5040)
stay on the VM permanently.
* infra/modules/docker-registry/nginx_registry.conf: upstream
`private` block + port 5050 server block removed.
* infra/stacks/monitoring/modules/monitoring/main.tf: registry_
integrity_probe + registry_probe_credentials resources stripped.
forgejo_integrity_probe is the only manifest probe now.
Phase 5 — final docs sweep:
* infra/docs/runbooks/registry-vm.md — VM scope reduced to pull-
through caches; forgejo-registry-breakglass.md cross-ref added.
* infra/docs/architecture/ci-cd.md — registry component table +
diagram now reflect Forgejo. Pre-migration root-cause sentence
preserved as historical context with a pointer to the design doc.
* infra/docs/architecture/monitoring.md — Registry Integrity Probe
row updated to point at the Forgejo probe.
* infra/.claude/CLAUDE.md — Private registry section rewritten end-
to-end (auth, retention, integrity, where the bake came from).
* prometheus_chart_values.tpl — RegistryManifestIntegrityFailure
alert annotation simplified now that only one registry is in
scope.
Operational follow-up (cannot be done from a TF apply):
1. ssh root@10.0.20.10 — edit /opt/registry/docker-compose.yml to
match the new template AND `docker compose up -d --remove-orphans`
to actually stop the registry-private container. Memory id=1078
confirms cloud-init won't redeploy on TF apply alone.
2. After 1 week of no incidents, `rm -rf /opt/registry/data/private/`
on the VM (~2.6GB freed).
3. Open the dual-push step in build-ci-image.yml and drop
registry.viktorbarzin.me:5050 from the `repo:` list — at that
point the post-push integrity check at line 33-107 also needs
to be repointed at Forgejo or removed (the per-build verify is
redundant with the every-15min Forgejo probe).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
174 lines
4.8 KiB
Text
174 lines
4.8 KiB
Text
worker_processes auto;
|
|
error_log /var/log/nginx/error.log warn;
|
|
pid /tmp/nginx.pid;
|
|
|
|
events {
|
|
worker_connections 1024;
|
|
}
|
|
|
|
http {
|
|
proxy_cache_path /var/cache/nginx/registry
|
|
levels=1:2
|
|
keys_zone=registry:500m
|
|
max_size=50g
|
|
inactive=24h
|
|
use_temp_path=off;
|
|
|
|
log_format registry '$remote_addr [$time_local] "$request" '
|
|
'$status $body_bytes_sent '
|
|
'upstream=$upstream_addr time=$upstream_response_time '
|
|
'cache=$upstream_cache_status';
|
|
|
|
access_log /var/log/nginx/access.log registry;
|
|
|
|
# --- Upstreams ---
|
|
|
|
upstream dockerhub {
|
|
server registry-dockerhub:5000;
|
|
keepalive 32;
|
|
}
|
|
|
|
upstream ghcr {
|
|
server registry-ghcr:5000;
|
|
keepalive 32;
|
|
}
|
|
|
|
# `upstream private` removed in Phase 4 of forgejo-registry-consolidation
|
|
# 2026-05-07. The /v2/ private registry is now Forgejo at
|
|
# forgejo.viktorbarzin.me/viktor/.
|
|
|
|
# --- Docker Hub (port 5000) ---
|
|
|
|
server {
|
|
listen 5000;
|
|
server_name _;
|
|
|
|
client_max_body_size 0;
|
|
proxy_request_buffering off;
|
|
proxy_buffering on;
|
|
|
|
# Blobs are content-addressed (sha256) — immutable, safe to cache aggressively
|
|
location ~ /v2/.*/blobs/ {
|
|
proxy_pass http://dockerhub;
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header Connection "";
|
|
|
|
# Reject truncated upstream responses
|
|
proxy_intercept_errors on;
|
|
error_page 502 503 504 = @upstream_error;
|
|
|
|
proxy_cache registry;
|
|
proxy_cache_lock on;
|
|
proxy_cache_lock_timeout 5m;
|
|
proxy_cache_lock_age 5m;
|
|
proxy_cache_use_stale updating;
|
|
proxy_cache_valid 200 24h;
|
|
proxy_cache_valid any 0;
|
|
proxy_cache_min_uses 2;
|
|
proxy_cache_methods GET;
|
|
|
|
proxy_read_timeout 900;
|
|
proxy_send_timeout 900;
|
|
}
|
|
|
|
# Manifests are mutable (tags can change) — no cache, pass through to registry
|
|
location /v2/ {
|
|
proxy_pass http://dockerhub;
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header Connection "";
|
|
|
|
proxy_cache off;
|
|
|
|
proxy_read_timeout 900;
|
|
proxy_send_timeout 900;
|
|
}
|
|
|
|
location @upstream_error {
|
|
return 502 "upstream error";
|
|
}
|
|
|
|
location /healthz {
|
|
proxy_pass http://dockerhub/v2/;
|
|
proxy_read_timeout 5s;
|
|
proxy_connect_timeout 3s;
|
|
access_log off;
|
|
}
|
|
|
|
location / {
|
|
return 200 'ok';
|
|
add_header Content-Type text/plain;
|
|
}
|
|
}
|
|
|
|
# --- GHCR (port 5010) ---
|
|
|
|
server {
|
|
listen 5010;
|
|
server_name _;
|
|
|
|
client_max_body_size 0;
|
|
proxy_request_buffering off;
|
|
proxy_buffering on;
|
|
|
|
# Blobs are content-addressed (sha256) — immutable, safe to cache aggressively
|
|
location ~ /v2/.*/blobs/ {
|
|
proxy_pass http://ghcr;
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header Connection "";
|
|
|
|
# Reject truncated upstream responses
|
|
proxy_intercept_errors on;
|
|
error_page 502 503 504 = @upstream_error;
|
|
|
|
proxy_cache registry;
|
|
proxy_cache_lock on;
|
|
proxy_cache_lock_timeout 5m;
|
|
proxy_cache_lock_age 5m;
|
|
proxy_cache_use_stale updating;
|
|
proxy_cache_valid 200 24h;
|
|
proxy_cache_valid any 0;
|
|
proxy_cache_min_uses 2;
|
|
proxy_cache_methods GET;
|
|
|
|
proxy_read_timeout 900;
|
|
proxy_send_timeout 900;
|
|
}
|
|
|
|
# Manifests are mutable (tags can change) — no cache, pass through to registry
|
|
location /v2/ {
|
|
proxy_pass http://ghcr;
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header Connection "";
|
|
|
|
proxy_cache off;
|
|
|
|
proxy_read_timeout 900;
|
|
proxy_send_timeout 900;
|
|
}
|
|
|
|
location @upstream_error {
|
|
return 502 "upstream error";
|
|
}
|
|
|
|
location /healthz {
|
|
proxy_pass http://ghcr/v2/;
|
|
proxy_read_timeout 5s;
|
|
proxy_connect_timeout 3s;
|
|
access_log off;
|
|
}
|
|
|
|
location / {
|
|
return 200 'ok';
|
|
add_header Content-Type text/plain;
|
|
}
|
|
}
|
|
|
|
# --- Private R/W Registry (port 5050) removed Phase 4 2026-05-07 ---
|
|
# The TLS port 5050 server block previously fronted `registry-private`.
|
|
# Migrated to Forgejo at forgejo.viktorbarzin.me/viktor/. nginx no longer
|
|
# listens on 5050; docker-compose.yml drops the `5050:5050` port mapping.
|
|
}
|