فهرست منبع

Merge pull request #2993 from jpoimboe/rhel6-version-check

remove kernel version warning on rhel 6.5
Victor Vieux 11 سال پیش
والد
کامیت
41b5e87873
1فایلهای تغییر یافته به همراه3 افزوده شده و 1 حذف شده
  1. 3 1
      engine/engine.go

+ 3 - 1
engine/engine.go

@@ -70,7 +70,9 @@ func New(root string) (*Engine, error) {
 		log.Printf("WARNING: %s\n", err)
 		log.Printf("WARNING: %s\n", err)
 	} else {
 	} else {
 		if utils.CompareKernelVersion(k, &utils.KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
 		if utils.CompareKernelVersion(k, &utils.KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
-			log.Printf("WARNING: You are running linux kernel version %s, which might be unstable running docker. Please upgrade your kernel to 3.8.0.", k.String())
+			if os.Getenv("DOCKER_NOWARN_KERNEL_VERSION") == "" {
+				log.Printf("WARNING: You are running linux kernel version %s, which might be unstable running docker. Please upgrade your kernel to 3.8.0.", k.String())
+			}
 		}
 		}
 	}
 	}
 	if err := os.MkdirAll(root, 0700); err != nil && !os.IsExist(err) {
 	if err := os.MkdirAll(root, 0700); err != nil && !os.IsExist(err) {