1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-24 14:54:43 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 容器创建增加端口判断

Browse source
This commit is contained in:
ssongliu 2023-03-13 23:49:31 +08:00 committed by ssongliu
parent eb56b918a6
commit 2dec0bfb3c
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend/app/service/container.go
View file

@ -12,8 +12,10 @@ import (
"time" "time"
"github.com/1Panel-dev/1Panel/backend/app/dto" "github.com/1Panel-dev/1Panel/backend/app/dto"
"github.com/1Panel-dev/1Panel/backend/buserr"
"github.com/1Panel-dev/1Panel/backend/constant" "github.com/1Panel-dev/1Panel/backend/constant"
"github.com/1Panel-dev/1Panel/backend/global" "github.com/1Panel-dev/1Panel/backend/global"
"github.com/1Panel-dev/1Panel/backend/utils/common"
"github.com/1Panel-dev/1Panel/backend/utils/docker" "github.com/1Panel-dev/1Panel/backend/utils/docker"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
@ -136,6 +138,13 @@ func (u *ContainerService) Inspect(req dto.InspectReq) (string, error) {
} }
func (u *ContainerService) ContainerCreate(req dto.ContainerCreate) error { func (u *ContainerService) ContainerCreate(req dto.ContainerCreate) error {
if len(req.ExposedPorts) != 0 {
for _, port := range req.ExposedPorts {
if common.ScanPort(port.HostPort) {
return buserr.WithDetail(constant.ErrPortInUsed, port.HostPort, nil)
}
}
}
client, err := docker.NewDockerClient() client, err := docker.NewDockerClient()
if err != nil { if err != nil {
return err return err

4
frontend/src/views/container/container/create/index.vue
View file

@ -84,7 +84,7 @@
<el-form-item :label="$t('container.cpuQuota')" prop="nanoCPUs"> <el-form-item :label="$t('container.cpuQuota')" prop="nanoCPUs">
<el-input type="number" style="width: 40%" v-model.number="form.nanoCPUs"> <el-input type="number" style="width: 40%" v-model.number="form.nanoCPUs">
<template #append> <template #append>
<el-select v-model="form.cpuUnit" disabled style="width: 65px"> <el-select v-model="form.cpuUnit" disabled style="width: 85px">
<el-option label="Core" value="Core" /> <el-option label="Core" value="Core" />
</el-select> </el-select>
</template> </template>
@ -94,7 +94,7 @@
<el-form-item :label="$t('container.memoryLimit')" prop="memoryItem"> <el-form-item :label="$t('container.memoryLimit')" prop="memoryItem">
<el-input style="width: 40%" v-model.number="form.memoryItem"> <el-input style="width: 40%" v-model.number="form.memoryItem">
<template #append> <template #append>
<el-select v-model="form.memoryUnit" placeholder="Select" style="width: 65px"> <el-select v-model="form.memoryUnit" placeholder="Select" style="width: 85px">
<el-option label="KB" value="KB" /> <el-option label="KB" value="KB" />
<el-option label="MB" value="MB" /> <el-option label="MB" value="MB" />
<el-option label="GB" value="GB" /> <el-option label="GB" value="GB" />