浏览代码

Revert "Detect running in a container (#6495)" (#6662)

This reverts commit a60d9b89cec60f960841caa9881c4a48e4a87406.
Daniel Hiltgen 7 月之前
父节点
当前提交
9565fa64a8
共有 1 个文件被更改,包括 1 次插入23 次删除
  1. 1 23
      server/images.go

+ 1 - 23
server/images.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"bufio"
 	"bytes"
 	"cmp"
 	"context"
@@ -18,12 +17,10 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"slices"
 	"strconv"
 	"strings"
-	"sync"
 
 	"github.com/ollama/ollama/api"
 	"github.com/ollama/ollama/auth"
@@ -1090,7 +1087,7 @@ func makeRequest(ctx context.Context, method string, requestURL *url.URL, header
 		}
 	}
 
-	req.Header.Set("User-Agent", fmt.Sprintf("ollama/%s (%s %s) Go/%s%s", version.Version, runtime.GOARCH, runtime.GOOS, runtime.Version(), deployment()))
+	req.Header.Set("User-Agent", fmt.Sprintf("ollama/%s (%s %s) Go/%s", version.Version, runtime.GOARCH, runtime.GOOS, runtime.Version()))
 
 	if s := req.Header.Get("Content-Length"); s != "" {
 		contentLength, err := strconv.ParseInt(s, 10, 64)
@@ -1165,22 +1162,3 @@ func verifyBlob(digest string) error {
 
 	return nil
 }
-
-var deployment = sync.OnceValue(func() string {
-	if runtime.GOOS == "linux" {
-		file, err := os.Open("/proc/1/cgroup")
-		if err != nil {
-			return ""
-		}
-		defer file.Close()
-		anchorPoint := regexp.MustCompile("0::/.*/")
-		scanner := bufio.NewScanner(file)
-		for scanner.Scan() {
-			line := scanner.Text()
-			if anchorPoint.MatchString(line) {
-				return " container"
-			}
-		}
-	}
-	return ""
-})