From 2dec0bfb3c0b8a98c4ac5f86cfb470836a26e671 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Mon, 13 Mar 2023 23:49:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E5=AE=B9=E5=99=A8=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=AF=E5=8F=A3=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/container.go                        | 9 +++++++++
 frontend/src/views/container/container/create/index.vue | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/backend/app/service/container.go b/backend/app/service/container.go
index f7a7d7ab1..0a0b44738 100644
--- a/backend/app/service/container.go
+++ b/backend/app/service/container.go
@@ -12,8 +12,10 @@ import (
 	"time"
 
 	"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/global"
+	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/docker"
 	"github.com/docker/docker/api/types"
 	"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 {
+	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()
 	if err != nil {
 		return err
diff --git a/frontend/src/views/container/container/create/index.vue b/frontend/src/views/container/container/create/index.vue
index d938c5a0a..08a26c250 100644
--- a/frontend/src/views/container/container/create/index.vue
+++ b/frontend/src/views/container/container/create/index.vue
@@ -84,7 +84,7 @@
                     <el-form-item :label="$t('container.cpuQuota')" prop="nanoCPUs">
                         <el-input type="number" style="width: 40%" v-model.number="form.nanoCPUs">
                             <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-select>
                             </template>
@@ -94,7 +94,7 @@
                     <el-form-item :label="$t('container.memoryLimit')" prop="memoryItem">
                         <el-input style="width: 40%" v-model.number="form.memoryItem">
                             <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="MB" value="MB" />
                                     <el-option label="GB" value="GB" />