-
Notifications
You must be signed in to change notification settings - Fork 546
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add --blobs-to-disk to 'crane registry serve' (#1731)
* add --blobs-to-disk to 'crane registry serve' Signed-off-by: Jason Hall <[email protected]> * add tests Signed-off-by: Jason Hall <[email protected]> * mark flag hidden Signed-off-by: Jason Hall <[email protected]> * tasty boilerplate Signed-off-by: Jason Hall <[email protected]> * boilerplate mmm Signed-off-by: Jason Hall <[email protected]> --------- Signed-off-by: Jason Hall <[email protected]>
- Loading branch information
Showing
5 changed files
with
191 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Copyright 2023 Google LLC All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package registry | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "sync" | ||
|
|
||
| v1 "github.com/google/go-containerregistry/pkg/v1" | ||
| ) | ||
|
|
||
| type diskHandler struct { | ||
| dir string | ||
| lock sync.Mutex | ||
| } | ||
|
|
||
| func NewDiskBlobHandler(dir string) BlobHandler { return &diskHandler{dir: dir} } | ||
|
|
||
| func (m *diskHandler) Stat(_ context.Context, _ string, h v1.Hash) (int64, error) { | ||
| m.lock.Lock() | ||
| defer m.lock.Unlock() | ||
|
|
||
| fi, err := os.Stat(filepath.Join(m.dir, h.String())) | ||
| if errors.Is(err, os.ErrNotExist) { | ||
| return 0, errNotFound | ||
| } else if err != nil { | ||
| return 0, err | ||
| } | ||
| return fi.Size(), nil | ||
| } | ||
| func (m *diskHandler) Get(_ context.Context, _ string, h v1.Hash) (io.ReadCloser, error) { | ||
| m.lock.Lock() | ||
| defer m.lock.Unlock() | ||
|
|
||
| return os.Open(filepath.Join(m.dir, h.String())) | ||
| } | ||
| func (m *diskHandler) Put(_ context.Context, _ string, h v1.Hash, rc io.ReadCloser) error { | ||
| m.lock.Lock() | ||
| defer m.lock.Unlock() | ||
|
|
||
| f, err := os.Create(filepath.Join(m.dir, h.String())) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer f.Close() | ||
|
|
||
| if _, err := io.Copy(f, rc); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
| func (m *diskHandler) Delete(_ context.Context, _ string, h v1.Hash) error { | ||
| m.lock.Lock() | ||
| defer m.lock.Unlock() | ||
|
|
||
| return os.Remove(filepath.Join(m.dir, h.String())) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // Copyright 2023 Google LLC All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package registry_test | ||
|
|
||
| import ( | ||
| "net/http/httptest" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/google/go-containerregistry/pkg/name" | ||
| "github.com/google/go-containerregistry/pkg/registry" | ||
| "github.com/google/go-containerregistry/pkg/v1/random" | ||
| "github.com/google/go-containerregistry/pkg/v1/remote" | ||
| "github.com/google/go-containerregistry/pkg/v1/validate" | ||
| ) | ||
|
|
||
| func TestDiskPush(t *testing.T) { | ||
| dir := t.TempDir() | ||
| reg := registry.New(registry.WithBlobHandler(registry.NewDiskBlobHandler(dir))) | ||
| srv := httptest.NewServer(reg) | ||
| defer srv.Close() | ||
|
|
||
| ref, err := name.ParseReference(strings.TrimPrefix(srv.URL, "http://") + "/foo/bar:latest") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| img, err := random.Image(1024, 5) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := remote.Write(ref, img); err != nil { | ||
| t.Fatalf("remote.Write: %v", err) | ||
| } | ||
|
|
||
| // Test we can read and validate the image. | ||
| if _, err := remote.Image(ref); err != nil { | ||
| t.Fatalf("remote.Image: %v", err) | ||
| } | ||
| if err := validate.Image(img); err != nil { | ||
| t.Fatalf("validate.Image: %v", err) | ||
| } | ||
|
|
||
| // Collect the layer SHAs we expect to find. | ||
| want := map[string]bool{} | ||
| if h, err := img.ConfigName(); err != nil { | ||
| t.Fatal(err) | ||
| } else { | ||
| want[h.String()] = true | ||
| } | ||
| ls, err := img.Layers() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| for _, l := range ls { | ||
| if h, err := l.Digest(); err != nil { | ||
| t.Fatal(err) | ||
| } else { | ||
| want[h.String()] = true | ||
| } | ||
| } | ||
|
|
||
| // Test the blobs are there on disk. | ||
| for dig := range want { | ||
| if _, err := os.Stat(filepath.Join(dir, dig)); err != nil { | ||
| t.Fatalf("os.Stat(%s): %v", dig, err) | ||
| } | ||
| t.Logf("Found %s", dig) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters