diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2022-03-25 14:51:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 14:51:05 +0100 |
| commit | 0a3336fd7d19f7114fce2ff849a8989ed33e2059 (patch) | |
| tree | db47dbc11e416094d7bfb0ffc9c9f987b846db02 /integration | |
| parent | 4a26fdda76d996708aa8100dd23ea90215984451 (diff) | |
| parent | 098a44c07f38a14147a57feffa31b551a47f3c73 (diff) | |
Merge pull request #43366 from corhere/finish-identitymapping-refactor
Finish refactor of UID/GID usage to a new struct
Diffstat (limited to 'integration')
| -rw-r--r-- | integration/image/remove_unix_test.go | 2 | ||||
| -rw-r--r-- | integration/plugin/graphdriver/external_test.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/integration/image/remove_unix_test.go b/integration/image/remove_unix_test.go index ed24e276ff..046fa8532e 100644 --- a/integration/image/remove_unix_test.go +++ b/integration/image/remove_unix_test.go @@ -49,7 +49,7 @@ func TestRemoveImageGarbageCollector(t *testing.T) { MetadataStorePathTemplate: filepath.Join(d.RootDir(), "image", "%s", "layerdb"), GraphDriver: d.StorageDriver(), GraphDriverOptions: nil, - IDMapping: &idtools.IdentityMapping{}, + IDMapping: idtools.IdentityMapping{}, PluginGetter: nil, ExperimentalEnabled: false, }) diff --git a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go index 57fb27856d..cb261774b8 100644 --- a/integration/plugin/graphdriver/external_test.go +++ b/integration/plugin/graphdriver/external_test.go @@ -19,6 +19,7 @@ import ( "github.com/docker/docker/integration/internal/container" "github.com/docker/docker/integration/internal/requirement" "github.com/docker/docker/pkg/archive" + "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/testutil/daemon" "gotest.tools/v3/assert" @@ -146,9 +147,9 @@ func setupPlugin(t *testing.T, ec map[string]*graphEventsCounter, ext string, mu base, err := os.MkdirTemp("", name) assert.NilError(t, err) - vfsProto, err := vfs.Init(base, []string{}, nil, nil) + vfsProto, err := vfs.Init(base, []string{}, idtools.IdentityMapping{}) assert.NilError(t, err, "error initializing graph driver") - driver := graphdriver.NewNaiveDiffDriver(vfsProto, nil, nil) + driver := graphdriver.NewNaiveDiffDriver(vfsProto, idtools.IdentityMapping{}) ec[ext] = &graphEventsCounter{} mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) { |