diff --git a/server/images.go b/server/images.go index 06f8ffd9..58794031 100644 --- a/server/images.go +++ b/server/images.go @@ -795,10 +795,8 @@ func PruneLayers() error { for _, blob := range blobs { name := blob.Name() - if runtime.GOOS == "windows" { - name = strings.ReplaceAll(name, "-", ":") - } - if strings.HasPrefix(name, "sha256:") { + name = strings.ReplaceAll(name, "-", ":") + if strings.HasPrefix(name, "sha256-") { deleteMap[name] = struct{}{} } } diff --git a/server/layers.go b/server/layers.go index adbf7175..07787406 100644 --- a/server/layers.go +++ b/server/layers.go @@ -5,7 +5,6 @@ import ( "fmt" "io" "os" - "runtime" "strings" "golang.org/x/exp/slices" @@ -47,10 +46,7 @@ func NewLayer(r io.Reader, mediatype string) (*Layer, error) { return nil, err } - delimiter := ":" - if runtime.GOOS == "windows" { - delimiter = "-" - } + const delimiter = "-" pattern := strings.Join([]string{"sha256", "*-partial"}, delimiter) temp, err := os.CreateTemp(blobs, pattern) diff --git a/server/modelpath.go b/server/modelpath.go index af3f36ab..7d333876 100644 --- a/server/modelpath.go +++ b/server/modelpath.go @@ -6,7 +6,6 @@ import ( "net/url" "os" "path/filepath" - "runtime" "strings" ) @@ -150,10 +149,7 @@ func GetBlobsPath(digest string) (string, error) { return "", err } - if runtime.GOOS == "windows" { - digest = strings.ReplaceAll(digest, ":", "-") - } - + digest = strings.ReplaceAll(digest, ":", "-") path := filepath.Join(dir, "blobs", digest) dirPath := filepath.Dir(path) if digest == "" {