github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: 容器创建编辑增加拉取最新镜像选项 (#1597)

pull/1603/head
ssongliu 2023-07-10 22:45:08 +08:00 committed by GitHub
parent 55ed67eaed
commit b9227caaf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/app/dto/container.go
View File

@ -37,6 +37,7 @@ type ResourceLimit struct {
type ContainerOperate struct {
ContainerID string `json:"containerID"`
ForcePull bool `json:"forcePull"`
Name string `json:"name"`
Image string `json:"image"`
Network string `json:"network"`
@ -54,8 +55,9 @@ type ContainerOperate struct {
}
type ContainerUpgrade struct {
Name string `json:"name" validate:"required"`
Image string `json:"image" validate:"required"`
Name string `json:"name" validate:"required"`
Image string `json:"image" validate:"required"`
ForcePull bool `json:"forcePull"`
}
type ContainerListStats struct {

21
backend/app/service/container.go
View File

@ -317,9 +317,12 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
global.LOG.Infof("new container info %s has been made, now start to create", req.Name)
if !checkImageExist(client, req.Image) {
if !checkImageExist(client, req.Image) || req.ForcePull {
if err := pullImages(ctx, client, req.Image); err != nil {
return err
if !req.ForcePull {
return err
}
global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
}
}
container, err := client.ContainerCreate(ctx, &config, &hostConf, &networkConf, &v1.Platform{}, req.Name)
@ -410,9 +413,12 @@ func (u *ContainerService) ContainerUpdate(req dto.ContainerOperate) error {
if err != nil {
return err
}
if !checkImageExist(client, req.Image) {
if !checkImageExist(client, req.Image) || req.ForcePull {
if err := pullImages(ctx, client, req.Image); err != nil {
return err
if !req.ForcePull {
return err
}
global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
}
}
config := oldContainer.Config
@ -448,9 +454,12 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
if err != nil {
return err
}
if !checkImageExist(client, req.Image) {
if !checkImageExist(client, req.Image) || req.ForcePull {
if err := pullImages(ctx, client, req.Image); err != nil {
return err
if !req.ForcePull {
return err
}
global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
}
}
config := oldContainer.Config

3
backend/app/service/container_network.go
View File

@ -89,6 +89,9 @@ func (u *ContainerService) ListNetwork() ([]dto.Options, error) {
for _, item := range list {
datas = append(datas, dto.Options{Option: item.Name})
}
sort.Slice(datas, func(i, j int) bool {
return datas[i].Option < datas[j].Option
})
return datas, nil
}

9
backend/app/service/container_volume.go
View File

@ -80,13 +80,16 @@ func (u *ContainerService) ListVolume() ([]dto.Options, error) {
if err != nil {
return nil, err
}
var data []dto.Options
var datas []dto.Options
for _, item := range list.Volumes {
data = append(data, dto.Options{
datas = append(datas, dto.Options{
Option: item.Name,
})
}
return data, nil
sort.Slice(datas, func(i, j int) bool {
return datas[i].Option < datas[j].Option
})
return datas, nil
}
func (u *ContainerService) DeleteVolume(req dto.BatchDelete) error {
client, err := docker.NewDockerClient()

1
frontend/src/api/interface/container.ts
View File

@ -20,6 +20,7 @@ export namespace Container {
containerID: string;
name: string;
image: string;
forcePull: boolean;
network: string;
cmdStr: string;
memoryItem: number;

4
frontend/src/api/modules/container.ts
View File

@ -17,8 +17,8 @@ export const createContainer = (params: Container.ContainerHelper) => {
export const updateContainer = (params: Container.ContainerHelper) => {
return http.post(`/containers/update`, params, 3000000);
};
export const upgradeContainer = (name: string, image: string) => {
return http.post(`/containers/upgrade`, { name: name, image: image }, 3000000);
export const upgradeContainer = (name: string, image: string, forcePull: boolean) => {
return http.post(`/containers/upgrade`, { name: name, image: image, forcePull: forcePull }, 3000000);
};
export const loadContainerInfo = (name: string) => {
return http.post<Container.ContainerHelper>(`/containers/info`, { name: name });

1
frontend/src/lang/modules/en.ts
View File

@ -504,6 +504,7 @@ const message = {
appHelper:
'This container is sourced from the application store. Upgrading it may cause the service to be unavailable. Do you want to continue?',
forcePull: 'Pull the latest image',
server: 'Host',
serverExample: 'e.g. 80, 80-88, ip:80 or ip:80-88',
containerExample: 'e.g. 80 or 80-88',

1
frontend/src/lang/modules/tw.ts
View File

@ -493,6 +493,7 @@ const message = {
targetImageHelper: '請輸入目標鏡像版本',
appHelper: '該容器來源於應用商店，升級可能導致該服務不可用，是否繼續？',
forcePull: '拉取最新鏡像',
server: '服務器',
serverExample: '例： 80, 80-88, ip:80 或者 ip:80-88',
containerExample: '例： 80 或者 80-88',

1
frontend/src/lang/modules/zh.ts
View File

@ -493,6 +493,7 @@ const message = {
targetImageHelper: '请输入目标镜像版本',
appHelper: '该容器来源于应用商店，升级可能导致该服务不可用，是否继续？',
forcePull: '拉取最新镜像',
server: '服务器',
serverExample: '例： 80, 80-88, ip:80 或者 ip:80-88',
containerExample: '例： 80 或者 80-88',

2
frontend/src/views/container/container/index.vue
View File

@ -129,7 +129,7 @@
/>
<fu-table-operations
width="300px"
:ellipsis="3"
:ellipsis="4"
:buttons="buttons"
:label="$t('commons.table.operate')"
fix

5
frontend/src/views/container/container/operate/index.vue
View File

@ -26,6 +26,11 @@
/>
</el-select>
</el-form-item>
<el-form-item prop="forcePull">
<el-checkbox v-model="dialogData.rowData!.forcePull">
{{ $t('container.forcePull') }}
</el-checkbox>
</el-form-item>
<el-form-item :label="$t('commons.table.port')">
<el-radio-group v-model="dialogData.rowData!.publishAllPorts" class="ml-4">
<el-radio :label="false">{{ $t('container.exposePort') }}</el-radio>

8
frontend/src/views/container/container/upgrade/index.vue
View File

@ -38,6 +38,11 @@
<el-input v-model="form.newTag" :placeholder="$t('container.targetImageHelper')" />
<span class="input-help">{{ $t('container.upgradeHelper') }}</span>
</el-form-item>
<el-form-item prop="forcePull">
<el-checkbox v-model="form.forcePull">
{{ $t('container.forcePull') }}
</el-checkbox>
</el-form-item>
</el-form>
</el-col>
</el-row>
@ -71,6 +76,7 @@ const form = reactive({
oldTag: '',
newTag: '',
fromApp: false,
forcePull: false,
});
const formRef = ref<FormInstance>();
@ -106,7 +112,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
cancelButtonText: i18n.global.t('commons.button.cancel'),
}).then(async () => {
loading.value = true;
await upgradeContainer(form.name, form.imageName + ':' + form.newTag)
await upgradeContainer(form.name, form.imageName + ':' + form.newTag, form.forcePull)
.then(() => {
loading.value = false;
emit('search');