gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

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

Browse Source 
Refs https://github.com/1Panel-dev/1Panel/issues/2990
This commit is contained in:
zhengkunwang 2023-12-01 16:58:10 +08:00 committed by GitHub
parent e773bcbda2
commit 246115837e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/service/app_utils.go
View File

@ -1136,7 +1136,7 @@ func addDockerComposeCommonParam(composeMap map[string]interface{}, serviceName
if portExist { if portExist {
allowHost := "127.0.0.1" allowHost := "127.0.0.1"
if req.Advanced && req.AllowPort { if req.Advanced && req.AllowPort {
allowHost = "0.0.0.0" allowHost = ""
} }
params[constant.HostIP] = allowHost params[constant.HostIP] = allowHost
} }
@ -1148,7 +1148,7 @@ func getAppCommonConfig(envs map[string]interface{}) request.AppContainerConfig
config := request.AppContainerConfig{} config := request.AppContainerConfig{}
if hostIp, ok := envs[constant.HostIP]; ok { if hostIp, ok := envs[constant.HostIP]; ok {
config.AllowPort = hostIp.(string) == "0.0.0.0" config.AllowPort = hostIp.(string) != "127.0.0.1"
} else { } else {
config.AllowPort = true config.AllowPort = true
} }

9
frontend/src/views/app-store/detail/install/index.vue
View File

@ -65,6 +65,10 @@
:placeholder="$t('app.containerNameHelper')" :placeholder="$t('app.containerNameHelper')"
></el-input> ></el-input>
</el-form-item> </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 <el-form-item
:label="$t('container.cpuQuota')" :label="$t('container.cpuQuota')"
prop="cpuQuota" prop="cpuQuota"
@ -99,10 +103,7 @@
{{ $t('container.limitHelper', [limits.memory]) }}{{ req.memoryUnit }}B {{ $t('container.limitHelper', [limits.memory]) }}{{ req.memoryUnit }}B
</span> </span>
</el-form-item> </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-form-item prop="editCompose">
<el-checkbox v-model="req.editCompose" :label="$t('app.editCompose')" size="large" /> <el-checkbox v-model="req.editCompose" :label="$t('app.editCompose')" size="large" />
<span class="input-help">{{ $t('app.editComposeHelper') }}</span> <span class="input-help">{{ $t('app.editComposeHelper') }}</span>

9
frontend/src/views/app-store/installed/detail/index.vue
View File

@ -52,6 +52,10 @@
:placeholder="$t('app.containerNameHelper')" :placeholder="$t('app.containerNameHelper')"
></el-input> ></el-input>
</el-form-item> </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-form-item :label="$t('container.cpuQuota')" prop="cpuQuota">
<el-input <el-input
type="number" type="number"
@ -75,10 +79,7 @@
</el-input> </el-input>
<span class="input-help">{{ $t('container.limitHelper') }}</span> <span class="input-help">{{ $t('container.limitHelper') }}</span>
</el-form-item> </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-form-item prop="editCompose">
<el-checkbox v-model="paramModel.editCompose" :label="$t('app.editCompose')" size="large" /> <el-checkbox v-model="paramModel.editCompose" :label="$t('app.editCompose')" size="large" />
<span class="input-help">{{ $t('app.editComposeHelper') }}</span> <span class="input-help">{{ $t('app.editComposeHelper') }}</span>