github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Rename content/fs to content/local

Browse Source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2017-07-21 13:58:08 -07:00
parent 938f3185bd
commit bb3c9c5927
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/fs/locks.go → content/local/locks.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"sync" "sync"

2
content/fs/readerat.go → content/local/readerat.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"io" "io"

2
content/fs/store.go → content/local/store.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"context" "context"

2
content/fs/store_linux.go → content/local/store_linux.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"os" "os"

2
content/fs/store_test.go → content/local/store_test.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"bufio" "bufio"

2
content/fs/store_unix.go → content/local/store_unix.go
View File

@ -1,6 +1,6 @@
// +build darwin freebsd // +build darwin freebsd
package fs package local
import ( import (
"os" "os"

2
content/fs/store_windows.go → content/local/store_windows.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"os" "os"

2
content/fs/writer.go → content/local/writer.go
View File

@ -1,4 +1,4 @@
package fs package local
import ( import (
"os" "os"

4
metadata/content_test.go
View File

@ -7,14 +7,14 @@ import (
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/content/fs" "github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/content/testsuite" "github.com/containerd/containerd/content/testsuite"
) )
func TestContent(t *testing.T) { func TestContent(t *testing.T) {
testsuite.ContentSuite(t, "metadata", func(ctx context.Context, root string) (content.Store, func(), error) { testsuite.ContentSuite(t, "metadata", func(ctx context.Context, root string) (content.Store, func(), error) {
// TODO: Use mocked or in-memory store // TODO: Use mocked or in-memory store
cs, err := fs.NewStore(root) cs, err := local.NewStore(root)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

4
server/server.go
View File

@ -19,7 +19,7 @@ import (
snapshot "github.com/containerd/containerd/api/services/snapshot/v1" snapshot "github.com/containerd/containerd/api/services/snapshot/v1"
tasks "github.com/containerd/containerd/api/services/tasks/v1" tasks "github.com/containerd/containerd/api/services/tasks/v1"
version "github.com/containerd/containerd/api/services/version/v1" version "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/content/fs" "github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
@ -161,7 +161,7 @@ func loadPlugins(config *Config) ([]*plugin.Registration, error) {
Type: plugin.ContentPlugin, Type: plugin.ContentPlugin,
ID: "content", ID: "content",
Init: func(ic *plugin.InitContext) (interface{}, error) { Init: func(ic *plugin.InitContext) (interface{}, error) {
return fs.NewStore(ic.Root) return local.NewStore(ic.Root)
}, },
}) })
plugin.Register(&plugin.Registration{ plugin.Register(&plugin.Registration{