From 09661bf22ce83224a59cd4422072504cf7ad833f Mon Sep 17 00:00:00 2001 From: mrleo1nid <43583385+mrleo1nid@users.noreply.github.com> Date: Fri, 6 Nov 2026 02:20:38 +0300 Subject: [PATCH] =?UTF-8?q?Restore:=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B7=D0=B0?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B0=20minio/minio=20=D0=B8=20minio/mc=20?= =?UTF-8?q?=D0=BD=D0=B0=20pgsty/silo=20=D0=B8=20pgsty/mc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Образы minio удалены с Docker Hub, Stoat перешёл на silo (drop-in). Замена идёт через compose.restore.yml, исходные compose-файлы не трогаются. Co-Authored-By: Claude Sonnet 5.5 --- internal/restore/compose.go | 25 ++++++++++++++++++++++++- internal/restore/images_test.go | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 internal/restore/images_test.go diff --git a/internal/restore/compose.go b/internal/restore/compose.go index 8b1695e..f0b3b98 100644 --- a/internal/restore/compose.go +++ b/internal/restore/compose.go @@ -134,6 +134,22 @@ func (r *restorer) pullFallback(c manifest.Category, compose func(...string) err } } +// removedImages — образы, исчезнувшие из реестров, и их drop-in замены. +// minio/* убраны с Docker Hub; Stoat перешёл на форк silo (stoatchat/self-hosted#306), +// который сам мигрирует каталог данных minio. +var removedImages = map[string]string{ + "minio/minio": "docker.io/pgsty/silo", + "minio/mc": "docker.io/pgsty/mc", +} + +func replacedImage(ref string) (string, bool) { + repo, _, _ := strings.Cut(ref, "@") + repo, _, _ = strings.Cut(repo, ":") + repo = strings.TrimPrefix(repo, "docker.io/") + repl, ok := removedImages[repo] + return repl, ok +} + func (r *restorer) writePinFileSkip(c manifest.Category, skip map[string]bool) (string, error) { var services []string for name := range c.Compose.Images { @@ -149,7 +165,14 @@ func (r *restorer) writePinFileSkip(c manifest.Category, skip map[string]bool) ( if img.Built || img.Digest == "" || skip[svc] { continue } - fmt.Fprintf(&b, " %q:\n image: %q\n", svc, img.Digest) + ref := img.Digest + if repl, ok := replacedImage(ref); ok { + if skip == nil { + r.warn("%s: образ %s удалён из реестра, сервис %s переведён на %s", c.Name, ref, svc, repl) + } + ref = repl + } + fmt.Fprintf(&b, " %q:\n image: %q\n", svc, ref) n++ } p := filepath.Join(c.Compose.Dir, pinFile) diff --git a/internal/restore/images_test.go b/internal/restore/images_test.go new file mode 100644 index 0000000..03d829e --- /dev/null +++ b/internal/restore/images_test.go @@ -0,0 +1,20 @@ +package restore + +import "testing" + +func TestReplacedImage(t *testing.T) { + cases := map[string]string{ + "minio/minio@sha256:abc": "docker.io/pgsty/silo", + "docker.io/minio/mc:latest": "docker.io/pgsty/mc", + "minio/minio": "docker.io/pgsty/silo", + } + for in, want := range cases { + got, ok := replacedImage(in) + if !ok || got != want { + t.Errorf("%s: got %q,%v want %q", in, got, ok, want) + } + } + if _, ok := replacedImage("mongo@sha256:abc"); ok { + t.Error("mongo не должен заменяться") + } +}