diff --git a/Makefile.am b/Makefile.am index 93e32df..fdc7231 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ EXTRA_mstorectl_SOURCES = \ mstored_SOURCES = cmd/mstored/main.go -EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go +EXTRA_mstored_SOURCES = app/starter/starter.go mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstorectl_SOURCES) $(EXTRA_mstored_SOURCES) env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES) @@ -210,7 +210,6 @@ EXTRA_mstored_SOURCES += \ EXTRA_DIST = vendor/* \ - \ Containerfile \ go.mod \ go.sum \ diff --git a/Makefile.in b/Makefile.in index 717864e..27aa0a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -391,7 +391,7 @@ EXTRA_mstorectl_SOURCES = \ cmd/mstorectl/imagecmd/pushimage.go mstored_SOURCES = cmd/mstored/main.go -EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go \ +EXTRA_mstored_SOURCES = app/starter/starter.go \ app/accoper/createacc.go app/accoper/creategrant.go \ app/accoper/delacc.go app/accoper/delgrant.go \ app/accoper/getacc.go app/accoper/getgrant.go \ @@ -462,7 +462,6 @@ EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go \ pkg/repocli/referer.go pkg/repocli/uuid.go pkg/terms/terms.go CWD = $(shell pwd) EXTRA_DIST = vendor/* \ - \ Containerfile \ go.mod \ go.sum \ diff --git a/test/file_test.go b/test/file_test.go index c2835ab..6438b9f 100644 --- a/test/file_test.go +++ b/test/file_test.go @@ -18,7 +18,7 @@ import ( ) func TestFileLife(t *testing.T) { - var srvport int64 = 10250 + var srvport uint32 = 10251 srvdir := t.TempDir() srvaddr := fmt.Sprintf("127.0.0.1:%d", srvport) @@ -80,7 +80,8 @@ func TestFileLife(t *testing.T) { mw := filecli.NewBasicAuthMiddleware(ref.Userinfo()) cli := filecli.NewClient(nil, mw) - err = cli.PutFile(ctx, ref.Raw(), file, size) + mime := "application/octet-stream" + err = cli.PutFile(ctx, ref.Raw(), mime, file, size) require.NoError(t, err) } {