1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-18 21:38:57 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix container orchestration format validation issues (#11280)

Browse source 
Refs #11227
This commit is contained in:
ssongliu 2025-12-09 18:36:57 +08:00 • committed by GitHub
parent 66e7223db9
commit 1b7be836ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agent/go.mod
View file

@ -24,7 +24,6 @@ require (
github.com/go-redis/redis v6.15.9+incompatible github.com/go-redis/redis v6.15.9+incompatible
github.com/go-resty/resty/v2 v2.16.5 github.com/go-resty/resty/v2 v2.16.5
github.com/go-sql-driver/mysql v1.8.1 github.com/go-sql-driver/mysql v1.8.1
github.com/goccy/go-yaml v1.9.8
github.com/goh-chunlin/go-onedrive v1.1.1 github.com/goh-chunlin/go-onedrive v1.1.1
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
@ -141,6 +140,7 @@ require (
github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/goccy/go-json v0.10.5 // indirect github.com/goccy/go-json v0.10.5 // indirect
github.com/goccy/go-yaml v1.9.8 // indirect
github.com/gofrs/flock v0.13.0 // indirect github.com/gofrs/flock v0.13.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect github.com/golang/protobuf v1.5.4 // indirect

2
agent/utils/compose/compose.go
View file

@ -15,7 +15,7 @@ import (
"github.com/1Panel-dev/1Panel/agent/utils/cmd" "github.com/1Panel-dev/1Panel/agent/utils/cmd"
"github.com/1Panel-dev/1Panel/agent/utils/common" "github.com/1Panel-dev/1Panel/agent/utils/common"
"github.com/1Panel-dev/1Panel/agent/utils/docker" "github.com/1Panel-dev/1Panel/agent/utils/docker"
"github.com/goccy/go-yaml" "gopkg.in/yaml.v3"
) )
func checkCmd() error { func checkCmd() error {

14
frontend/src/views/container/compose/index.vue
View file

@ -337,7 +337,12 @@
</template> </template>
</LayoutContent> </LayoutContent>
<TaskLog ref="taskLogRef" width="70%" @close="search(true)" /> <TaskLog ref="taskLogRef" width="70%">
<template #task-footer>
<el-button @click="handleClose">{{ $t('commons.table.backToList') }}</el-button>
<el-button type="primary" @click="closeTask">{{ $t('commons.table.keepEdit') }}</el-button>
</template>
</TaskLog>
<FileList ref="fileRef" @choose="loadDir" /> <FileList ref="fileRef" @choose="loadDir" />
<DeleteDialog @search="search(true)" ref="dialogDelRef" /> <DeleteDialog @search="search(true)" ref="dialogDelRef" />
<ContainerInspectDialog ref="containerInspectRef" /> <ContainerInspectDialog ref="containerInspectRef" />
@ -581,6 +586,13 @@ const changePath = async () => {
const loadDir = async (path: string) => { const loadDir = async (path: string) => {
form.path = path; form.path = path;
}; };
const handleClose = () => {
search(true);
taskLogRef.value?.handleClose();
};
const closeTask = () => {
taskLogRef.value?.handleClose();
};
const onDelete = (row: any) => { const onDelete = (row: any) => {
dialogDelRef.value.acceptParams({ dialogDelRef.value.acceptParams({