matt/ollama37
1
0
Fork 0
mirror of https://github.com/dogkeeper886/ollama37.git synced 2025-12-10 15:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix FROM instruction erroring when referring to a file

Browse Source
This commit is contained in:
Jeffrey Morgan
2023-08-22 09:39:42 -07:00
parent 0a892419ad
commit a9f6c56652
5 changed files with 47 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
server/images.go
View File

@@ -153,11 +153,7 @@ func GetManifest(mp ModelPath) (*ManifestV2, error) {
}
func GetModel(name string) (*Model, error) {
mp, err := ParseModelPath(name, false)
if err != nil {
return nil, err
}
mp := ParseModelPath(name)
manifest, err := GetManifest(mp)
if err != nil {
return nil, err
@@ -276,11 +272,7 @@ func CreateModel(ctx context.Context, name string, path string, fn func(resp api
fn(api.ProgressResponse{Status: "looking for model"})
embed.model = c.Args
mp, err := ParseModelPath(c.Args, false)
if err != nil {
return err
}
mp := ParseModelPath(c.Args)
mf, err := GetManifest(mp)
if err != nil {
modelFile, err := filenameWithPath(path, c.Args)
@@ -682,11 +674,7 @@ func SaveLayers(layers []*LayerReader, fn func(resp api.ProgressResponse), force
}
func CreateManifest(name string, cfg *LayerReader, layers []*Layer) error {
mp, err := ParseModelPath(name, false)
if err != nil {
return err
}
mp := ParseModelPath(name)
manifest := ManifestV2{
SchemaVersion: 2,
MediaType: "application/vnd.docker.distribution.manifest.v2+json",
@@ -817,21 +805,13 @@ func CreateLayer(f io.ReadSeeker) (*LayerReader, error) {
}
func CopyModel(src, dest string) error {
srcModelPath, err := ParseModelPath(src, false)
if err != nil {
return err
}
srcModelPath := ParseModelPath(src)
srcPath, err := srcModelPath.GetManifestPath(false)
if err != nil {
return err
}
destModelPath, err := ParseModelPath(dest, false)
if err != nil {
return err
}
destModelPath := ParseModelPath(dest)
destPath, err := destModelPath.GetManifestPath(true)
if err != nil {
return err
@@ -854,11 +834,7 @@ func CopyModel(src, dest string) error {
}
func DeleteModel(name string) error {
mp, err := ParseModelPath(name, false)
if err != nil {
return err
}
mp := ParseModelPath(name)
manifest, err := GetManifest(mp)
if err != nil {
return err
@@ -884,10 +860,7 @@ func DeleteModel(name string) error {
return nil
}
tag := path[:slashIndex] + ":" + path[slashIndex+1:]
fmp, err := ParseModelPath(tag, false)
if err != nil {
return err
}
fmp := ParseModelPath(tag)
// skip the manifest we're trying to delete
if mp.GetFullTagname() == fmp.GetFullTagname() {
@@ -940,13 +913,13 @@ func DeleteModel(name string) error {
}
func PushModel(ctx context.Context, name string, regOpts *RegistryOptions, fn func(api.ProgressResponse)) error {
mp, err := ParseModelPath(name, regOpts.Insecure)
if err != nil {
return err
}
mp := ParseModelPath(name)
fn(api.ProgressResponse{Status: "retrieving manifest"})
if mp.ProtocolScheme == "http" && !regOpts.Insecure {
return fmt.Errorf("insecure protocol http")
}
manifest, err := GetManifest(mp)
if err != nil {
fn(api.ProgressResponse{Status: "couldn't retrieve manifest"})
@@ -1026,9 +999,10 @@ func PushModel(ctx context.Context, name string, regOpts *RegistryOptions, fn fu
}
func PullModel(ctx context.Context, name string, regOpts *RegistryOptions, fn func(api.ProgressResponse)) error {
mp, err := ParseModelPath(name, regOpts.Insecure)
if err != nil {
return err
mp := ParseModelPath(name)
if mp.ProtocolScheme == "http" && !regOpts.Insecure {
return fmt.Errorf("insecure protocol http")
}
fn(api.ProgressResponse{Status: "pulling manifest"})