feat: 应用支持启用 GPU (#6246)

agent/app/api/v2/app.go

@@ -5,7 +5,6 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 	"github.com/1Panel-dev/1Panel/agent/constant"
-	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/1Panel-dev/1Panel/agent/i18n"
 	"github.com/gin-gonic/gin"
 )
@@ -56,11 +55,10 @@ func (b *BaseApi) SyncApp(c *gin.Context) {
 		}
 		return
 	}
-	go func() {
-		if err = appService.SyncAppListFromRemote(req.TaskID); err != nil {
-			global.LOG.Errorf("Synchronization with the App Store failed [%s]", err.Error())
-		}
-	}()
+	if err = appService.SyncAppListFromRemote(req.TaskID); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
 	helper.SuccessWithData(c, nil)
 }
 

agent/app/dto/app.go

@@ -96,6 +96,7 @@ type AppProperty struct {
 	Document           string   `json:"document"`
 	Architectures      []string `json:"architectures"`
 	MemoryRequired     int      `json:"memoryRequired"`
+	GpuSupport         bool     `json:"gpuSupport"`
 }
 
 type AppConfigVersion struct {

agent/app/dto/request/app.go

@@ -36,6 +36,7 @@ type AppContainerConfig struct {
 	DockerCompose string  `json:"dockerCompose"`
 	HostMode      bool    `json:"hostMode"`
 	PullImage     bool    `json:"pullImage"`
+	GpuConfig     bool    `json:"gpuConfig"`
 }
 
 type AppInstalledSearch struct {

agent/app/dto/response/app.go

@@ -44,6 +44,7 @@ type AppDto struct {
 	Tags        []model.Tag `json:"tags"`
 	Github      string      `json:"github"`
 	Website     string      `json:"website"`
+	GpuSupport  bool        `json:"gpuSupport"`
 }
 
 type TagDTO struct {
@@ -73,6 +74,7 @@ type AppDetailDTO struct {
 	HostMode       bool        `json:"hostMode"`
 	Architectures  string      `json:"architectures"`
 	MemoryRequired int         `json:"memoryRequired"`
+	GpuSupport     bool        `json:"gpuSupport"`
 }
 
 type IgnoredApp struct {

agent/app/model/app.go

@@ -28,6 +28,7 @@ type App struct {
 	LastModified       int    `json:"lastModified"`
 	Architectures      string `json:"architectures"`
 	MemoryRequired     int    `json:"memoryRequired"`
+	GpuSupport         bool   `json:"gpuSupport"`
 
 	Details []AppDetail `json:"-" gorm:"-:migration"`
 	TagsKey []string    `json:"tags" yaml:"tags" gorm:"-"`

agent/app/service/app.go

@@ -111,6 +111,7 @@ func (a AppService) PageApp(req request.AppSearch) (interface{}, error) {
 			Limit:       ap.Limit,
 			Website:     ap.Website,
 			Github:      ap.Github,
+			GpuSupport:  ap.GpuSupport,
 		}
 		appDTOs = append(appDTOs, appDTO)
 		appTags, err := appTagRepo.GetByAppId(ap.ID)
@@ -263,7 +264,8 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 		appDetailDTO.Enable = false
 	}
 	appDetailDTO.Architectures = app.Architectures
-	appDetailDTO.MemoryLimit = app.MemoryLimit
+	appDetailDTO.MemoryRequired = app.MemoryRequired
+	appDetailDTO.GpuSupport = app.GpuSupport
 	return appDetailDTO, nil
 }
 func (a AppService) GetAppDetailByID(id uint) (*response.AppDetailDTO, error) {
@@ -1057,5 +1059,11 @@ func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
 		return nil
 	}, nil)
 
-	return syncTask.Execute()
+	go func() {
+		if err = syncTask.Execute(); err != nil {
+			_ = NewISettingService().Update("AppStoreSyncStatus", constant.Error)
+		}
+	}()
+
+	return nil
 }

agent/app/service/app_utils.go

@@ -1120,6 +1120,7 @@ func getApps(oldApps []model.App, items []dto.AppDefine) map[string]model.App {
 		app.ReadMe = item.ReadMe
 		app.MemoryRequired = config.MemoryRequired
 		app.Architectures = strings.Join(config.Architectures, ",")
+		app.GpuSupport = config.GpuSupport
 		apps[key] = app
 	}
 	return apps
@@ -1509,6 +1510,17 @@ func addDockerComposeCommonParam(composeMap map[string]interface{}, serviceName
 		"cpus":   "${CPUS}",
 		"memory": "${MEMORY_LIMIT}",
 	}
+	if req.GpuConfig {
+		resource["reservations"] = map[string]interface{}{
+			"devices": []map[string]interface{}{
+				{
+					"driver":       "nvidia",
+					"count":        "all",
+					"capabilities": []string{"gpu"},
+				},
+			},
+		}
+	}
 	deploy["resources"] = resource
 	serviceValue["deploy"] = deploy
 

agent/init/migration/migrations/init.go

@@ -245,7 +245,7 @@ var AddTaskDB = &gormigrate.Migration{
 }
 
 var UpdateApp = &gormigrate.Migration{
-	ID: "20240823-update-app",
+	ID: "20240826-update-app",
 	Migrate: func(tx *gorm.DB) error {
 		return tx.AutoMigrate(
 			&model.App{})

frontend/src/api/interface/app.ts

@@ -51,6 +51,7 @@ export namespace App {
         hostMode?: boolean;
         memoryRequired: number;
         architectures: string;
+        gpuSupport: boolean;
     }
 
     export interface AppReq extends ReqPage {

frontend/src/lang/modules/en.ts

@@ -1880,6 +1880,9 @@ const message = {
         showCurrentArch: 'Architecture',
         syncLocalApp: 'Sync Local App',
         memoryRequiredHelper: 'Current application memory requirement {0}',
+        gpuConfig: 'Enable GPU Support',
+        gpuConfigHelper:
+            'Please ensure the machine has an NVIDIA GPU and that NVIDIA drivers and the NVIDIA Docker Container Toolkit are installed',
     },
     website: {
         website: 'Website',

frontend/src/lang/modules/tw.ts

@@ -1746,6 +1746,8 @@ const message = {
         showCurrentArch: '僅顯示當前架構',
         syncLocalApp: '同步本地應用',
         memoryRequiredHelper: '目前應用記憶體需求 {0}',
+        gpuConfig: '開啟 GPU 支援',
+        gpuConfigHelper: '請確保機器有 NVIDIA GPU 並且安裝 NVIDIA 驅動 和 NVIDIA docker Container Toolkit',
     },
     website: {
         website: '網站',

frontend/src/lang/modules/zh.ts

@@ -1747,6 +1747,8 @@ const message = {
         showCurrentArch: '仅显示当前服务器架构应用',
         syncLocalApp: '同步本地应用',
         memoryRequiredHelper: '当前应用内存需求 {0}',
+        gpuConfig: '开启 GPU 支持',
+        gpuConfigHelper: '请确保机器有 NVIDIA GPU 并且安装 NVIDIA 驱动 和 NVIDIA docker Container Toolkit',
     },
     website: {
         website: '网站',

frontend/src/views/app-store/detail/install/index.vue

@@ -90,6 +90,10 @@
                         {{ $t('container.limitHelper', [limits.memory]) }}{{ req.memoryUnit }}B
                     </span>
                 </el-form-item>
+                <el-form-item pro="gpuConfig" v-if="gpuSupport">
+                    <el-checkbox v-model="req.gpuConfig" :label="$t('app.gpuConfig')" size="large" />
+                    <span class="input-help">{{ $t('app.gpuConfigHelper') }}</span>
+                </el-form-item>
                 <el-form-item pro="pullImage">
                     <el-checkbox v-model="req.pullImage" :label="$t('container.forcePull')" size="large" />
                     <span class="input-help">{{ $t('container.forcePullHelper') }}</span>
@@ -170,6 +174,7 @@ const initData = () => ({
     appID: '',
     pullImage: true,
     taskID: '',
+    gpuConfig: false,
 });
 const req = reactive(initData());
 const limits = ref<Container.ResourceLimit>({
@@ -189,6 +194,7 @@ const paramKey = ref(1);
 const isHostMode = ref(false);
 const taskLogRef = ref();
 const memoryRequired = ref(0);
+const gpuSupport = ref(false);
 
 const changeUnit = () => {
     if (req.memoryUnit == 'M') {
@@ -237,6 +243,7 @@ const getAppDetail = async (version: string) => {
         installData.value.params = res.data.params;
         paramKey.value++;
         memoryRequired.value = res.data.memoryRequired;
+        gpuSupport.value = res.data.gpuSupport;
     } catch (error) {
     } finally {
         loading.value = false;