0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace json.Unmarshal with NewFromJSON in Create

Browse source 
Signed-off-by: Jim Lin <b04705003@ntu.edu.tw>
(cherry picked from commit c9ec21e17a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Jim Lin 2021-01-11 22:59:35 +08:00 committed by Sebastiaan van Stijn
parent fae366b323
commit 34446d0343
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
image/store.go
View file

@ -1,7 +1,6 @@
package image // import "github.com/docker/docker/image"
import (
"encoding/json"
"fmt"
"sync"
"time"
@ -118,8 +117,8 @@ func (is *store) restore() error {
}
func (is *store) Create(config []byte) (ID, error) {
var img Image
err := json.Unmarshal(config, &img)
var img *Image
img, err := NewFromJSON(config)
if err != nil {
return "", err
}

8
image/store_test.go
View file

@ -10,6 +10,14 @@ import (
"gotest.tools/v3/assert/cmp"
)
func TestCreate(t *testing.T) {
is, cleanup := defaultImageStore(t)
defer cleanup()
_, err := is.Create([]byte(`{}`))
assert.Check(t, cmp.Error(err, "invalid image JSON, no RootFS key"))
}
func TestRestore(t *testing.T) {
fs, cleanup := defaultFSStoreBackend(t)
defer cleanup()