feat: 应用安装增加 IPV6 地址端口监听 (#3130)

Refs #2990
1Panel-dev · Dec 1, 2023 · 2461158 · 2461158
1 parent e773bcb
commit 2461158
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go
@@ -1136,7 +1136,7 @@ func addDockerComposeCommonParam(composeMap map[string]interface{}, serviceName
  if portExist {
  allowHost := "127.0.0.1"
  if req.Advanced && req.AllowPort {
- allowHost = "0.0.0.0"
+ allowHost = ""
  }
  params[constant.HostIP] = allowHost
  }
@@ -1148,7 +1148,7 @@ func getAppCommonConfig(envs map[string]interface{}) request.AppContainerConfig
  config := request.AppContainerConfig{}
 
  if hostIp, ok := envs[constant.HostIP]; ok {
- config.AllowPort = hostIp.(string) == "0.0.0.0"
+ config.AllowPort = hostIp.(string) != "127.0.0.1"
  } else {
  config.AllowPort = true
  }

diff --git a/frontend/src/views/app-store/detail/install/index.vue b/frontend/src/views/app-store/detail/install/index.vue
@@ -65,6 +65,10 @@
  :placeholder="$t('app.containerNameHelper')"
  ></el-input>
  </el-form-item>
+ <el-form-item prop="allowPort" v-if="!isHostMode">
+ <el-checkbox v-model="req.allowPort" :label="$t('app.allowPort')" size="large" />
+ <span class="input-help">{{ $t('app.allowPortHelper') }}</span>
+ </el-form-item>
  <el-form-item
  :label="$t('container.cpuQuota')"
  prop="cpuQuota"
@@ -99,10 +103,7 @@
  {{ $t('container.limitHelper', [limits.memory]) }}{{ req.memoryUnit }}B
  </span>
  </el-form-item>
- <el-form-item prop="allowPort" v-if="!isHostMode">
- <el-checkbox v-model="req.allowPort" :label="$t('app.allowPort')" size="large" />
- <span class="input-help">{{ $t('app.allowPortHelper') }}</span>
- </el-form-item>
+
  <el-form-item prop="editCompose">
  <el-checkbox v-model="req.editCompose" :label="$t('app.editCompose')" size="large" />
  <span class="input-help">{{ $t('app.editComposeHelper') }}</span>

diff --git a/frontend/src/views/app-store/installed/detail/index.vue b/frontend/src/views/app-store/installed/detail/index.vue
@@ -52,6 +52,10 @@
  :placeholder="$t('app.containerNameHelper')"
  ></el-input>
  </el-form-item>
+ <el-form-item prop="allowPort" v-if="!paramModel.isHostMode">
+ <el-checkbox v-model="paramModel.allowPort" :label="$t('app.allowPort')" size="large" />
+ <span class="input-help">{{ $t('app.allowPortHelper') }}</span>
+ </el-form-item>
  <el-form-item :label="$t('container.cpuQuota')" prop="cpuQuota">
  <el-input
  type="number"
@@ -75,10 +79,7 @@
  </el-input>
  <span class="input-help">{{ $t('container.limitHelper') }}</span>
  </el-form-item>
- <el-form-item prop="allowPort" v-if="!paramModel.isHostMode">
- <el-checkbox v-model="paramModel.allowPort" :label="$t('app.allowPort')" size="large" />
- <span class="input-help">{{ $t('app.allowPortHelper') }}</span>
- </el-form-item>
+
  <el-form-item prop="editCompose">
  <el-checkbox v-model="paramModel.editCompose" :label="$t('app.editCompose')" size="large" />
  <span class="input-help">{{ $t('app.editComposeHelper') }}</span>