diff --git a/src/frontend/devops-environment/src/components/devops/environment/basic-information.vue b/src/frontend/devops-environment/src/components/devops/environment/basic-information.vue
index 08bf401e743..3396e94caf6 100755
--- a/src/frontend/devops-environment/src/components/devops/environment/basic-information.vue
+++ b/src/frontend/devops-environment/src/components/devops/environment/basic-information.vue
@@ -64,6 +64,42 @@
                     </div>
                 </div>
             </div>
+            <div class="item-content">
+                <div class="item-label">{{ $t('environment.nodeInfo.dockerMaxConcurrency') }}</div>
+                <div class="item-value">
+                    <div class="display-item" v-if="isEditDockerCount">
+                        <input type="number" class="bk-form-input parallelTaskCount-input"
+                            ref="dockerParallelTaskCount"
+                            name="dockerParallelTaskCount"
+                            :placeholder="$t('environment.nodeInfo.parallelTaskCountTips')"
+                            v-validate.initial="`required|between:0,100|decimal:0`"
+                            v-model="dockerParallelTaskCount"
+                            :class="{ 'is-danger': errors.has('dockerParallelTaskCount') }">
+                    </div>
+                    <div class="editing-item" v-else>{{ nodeDetails.dockerParallelTaskCount || '--' }}</div>
+                </div>
+                <div class="handle-btn">
+                    <div v-if="isEditDockerCount">
+                        <span @click="saveHandle('dockerParallelTaskCount')">{{ $t('environment.save') }}</span>
+                        <span @click="editHandle('dockerParallelTaskCount', false)">{{ $t('environment.cancel') }}</span>
+                    </div>
+                    <div
+                        v-else
+                        v-perm="{
+                            hasPermission: nodeDetails.canEdit,
+                            disablePermissionApi: true,
+                            permissionData: {
+                                projectId: projectId,
+                                resourceType: NODE_RESOURCE_TYPE,
+                                resourceCode: nodeHashId,
+                                action: NODE_RESOURCE_ACTION.EDIT
+                            }
+                        }"
+                    >
+                        <span @click="editHandle('dockerParallelTaskCount', true)">{{ $t('environment.edit') }}</span>
+                    </div>
+                </div>
+            </div>
             <div class="item-content">
                 <div class="item-label">{{ $t('environment.status') }}</div>
                 <div
@@ -116,9 +152,11 @@
                 isEditCount: false,
                 isEditCreatedUser: false,
                 isEditNoticeType: false,
+                isEditDockerCount: false,
                 workspace: '',
                 createdUser: '',
                 parallelTaskCount: 0,
+                dockerParallelTaskCount: 0,
                 noticeTypeList: [
                     { name: 'work-wechat', value: 'RTX', isChecked: true },
                     { name: 'wechat', value: 'WECHAT', isChecked: false },
@@ -181,24 +219,46 @@
                     case 'noticeType':
                         this.isEditNoticeType = isOpen
                         break
+                    case 'dockerParallelTaskCount':
+                        this.isEditDockerCount = isOpen
+                        if (isOpen) {
+                            this.dockerParallelTaskCount = this.nodeDetails.dockerParallelTaskCount
+                            this.$nextTick(() => {
+                                this.$refs.dockerParallelTaskCount.focus()
+                            })
+                        }
+                        break
                     default:
                         break
                 }
             },
-            async saveHandle () {
+            async saveHandle (type) {
                 const valid = await this.$validator.validate()
-                if (valid) {
-                    this.saveParallelTaskCount(this.parallelTaskCount)
+                if (!valid) return
+                switch (type) {
+                    case 'parallelTaskCount':
+                        this.saveParallelTaskCount(this.parallelTaskCount, 'parallelTaskCount')
+                        break
+                    case 'dockerParallelTaskCount':
+                        this.saveParallelTaskCount(this.dockerParallelTaskCount, 'dockerParallelTaskCount')
+                        break
+                    default:
+                        break
                 }
             },
-            async saveParallelTaskCount (parallelTaskCount) {
+            async saveParallelTaskCount (count, type) {
                 let message, theme
+                const fn = type === 'dockerParallelTaskCount'
+                    ? 'environment/saveDockerParallelTaskCount'
+                    : 'environment/saveParallelTaskCount'
+                const params = {
+                    projectId: this.projectId,
+                    nodeHashId: this.nodeHashId,
+                    count: count
+                }
+
                 try {
-                    await this.$store.dispatch('environment/saveParallelTaskCount', {
-                        projectId: this.projectId,
-                        nodeHashId: this.nodeHashId,
-                        parallelTaskCount
-                    })
+                    await this.$store.dispatch(fn, params)
                     message = this.$t('environment.successfullySaved')
                     theme = 'success'
                     this.requestNodeDetail()
@@ -206,6 +266,8 @@
                     message = err.message ? err.message : err
                     theme = 'error'
                 } finally {
+                    this.isEditCount = false
+                    this.isEditDockerCount = false
                     this.$bkMessage({
                         message,
                         theme
@@ -219,7 +281,6 @@
                         nodeHashId: this.nodeHashId
                     })
                     this.$store.commit('environment/updateNodeDetail', { res })
-                    this.isEditCount = false
                 } catch (e) {
                     this.handleError(
                         e,
@@ -260,7 +321,7 @@
             align-items: center;
             border-bottom: 1px solid #DDE4EB;
             .item-label {
-                width: 180px;
+                width: 188px;
                 padding: 12px 20px;
                 border-right: 1px solid #DDE4EB;
             }
diff --git a/src/frontend/devops-environment/src/store/actions.js b/src/frontend/devops-environment/src/store/actions.js
index 87759424dd8..67b378c18ee 100755
--- a/src/frontend/devops-environment/src/store/actions.js
+++ b/src/frontend/devops-environment/src/store/actions.js
@@ -225,8 +225,8 @@ const actions = {
     /**
     * 设置agent构建并发数
     */
-    saveParallelTaskCount ({ commit }, { projectId, nodeHashId, parallelTaskCount }) {
-        return vue.$ajax.post(`${prefix}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/parallelTaskCount?parallelTaskCount=${parallelTaskCount}`).then(response => {
+    saveParallelTaskCount ({ commit }, { projectId, nodeHashId, count }) {
+        return vue.$ajax.post(`${prefix}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/parallelTaskCount?parallelTaskCount=${count}`).then(response => {
             return response
         })
     },
@@ -286,7 +286,16 @@ const actions = {
     },
     enableNode (_, { projectId, envHashId, nodeHashId, enableNode }) {
         return vue.$ajax.put(`${prefix}/user/environment/${projectId}/${envHashId}/enableNode/${nodeHashId}?enableNode=${enableNode}`)
+    },
+    /**
+    * 设置docker构建并发数
+    */
+    saveDockerParallelTaskCount ({ commit }, { projectId, nodeHashId, count }) {
+        return vue.$ajax.post(`${prefix}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/dockerParallelTaskCount?count=${count}`).then(response => {
+            return response
+        })
     }
+
 }
 
 export default actions
diff --git a/src/frontend/devops-pipeline/src/components/AtomFormComponent/InputParameterArray/index.vue b/src/frontend/devops-pipeline/src/components/AtomFormComponent/InputParameterArray/index.vue
new file mode 100644
index 00000000000..878314b75ff
--- /dev/null
+++ b/src/frontend/devops-pipeline/src/components/AtomFormComponent/InputParameterArray/index.vue
@@ -0,0 +1,94 @@
+<template>
+    <ul class="param-main">
+        <li
+            class="param-item"
+            v-for="(param, index) in parameters"
+            :key="index"
+        >
+            <bk-input
+                :value="param"
+                @change="(val) => handleChangeInput(val, index)"
+            >
+            </bk-input>
+            <i
+                class="bk-icon icon-plus-circle"
+                @click="plusParam()"
+            />
+            <i
+                :class="{
+                    'bk-icon icon-minus-circle': true,
+                    'disabled': parameters.length <= 1
+                }"
+                @click="minusParam(index)"
+            />
+        </li>
+    </ul>
+</template>
+
+<script>
+    export default {
+        name: 'InputParameterArray',
+        props: {
+            name: {
+                type: String,
+                default: ''
+            },
+            value: {
+                type: Array,
+                default: () => []
+            },
+            handleChange: {
+                type: Function,
+                required: true
+            }
+        },
+        data () {
+            return {
+                parameters: []
+            }
+        },
+        created () {
+            this.parameters = this.value
+            if (!this.parameters.length) this.plusParam()
+        },
+        methods: {
+            handleChangeInput (val, index) {
+                this.parameters[index] = val
+                this.handleChange(this.name, this.parameters)
+            },
+            plusParam () {
+                this.parameters.push('')
+            },
+            minusParam (index) {
+                if (this.parameters.length <= 1) return
+                this.parameters.splice(index, 1)
+                this.handleChange(this.name, this.parameters)
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .param-main {
+        .param-item {
+            margin-bottom: 10px;
+            display: flex;
+            align-items: center;
+            .select-custom {
+                flex: 1;
+                margin-right: 10px;
+                &.last-child {
+                    margin-right: 0;
+                }
+            }
+        }
+        .bk-icon {
+            margin-left: 5px;
+            font-size: 14px;
+            cursor: pointer;
+            &.disabled {
+                cursor: not-allowed;
+            }
+        }
+    }
+</style>
diff --git a/src/frontend/devops-pipeline/src/components/AtomSelector/imageSelector.vue b/src/frontend/devops-pipeline/src/components/AtomSelector/imageSelector.vue
index 34fa57492ac..1622eb27828 100644
--- a/src/frontend/devops-pipeline/src/components/AtomSelector/imageSelector.vue
+++ b/src/frontend/devops-pipeline/src/components/AtomSelector/imageSelector.vue
@@ -208,7 +208,7 @@
 
         watch: {
             buildResourceType (val) {
-                if (['DOCKER', 'IDC', 'PUBLIC_DEVCLOUD'].includes(val)) {
+                if (['DOCKER', 'IDC', 'PUBLIC_DEVCLOUD', 'THIRD_PARTY_AGENT_ID', 'THIRD_PARTY_AGENT_ENV'].includes(val)) {
                     this.isLoading = true
                     this.searchKey = ''
                     this.clearData()
@@ -269,12 +269,15 @@
                 this.isLoading = true
                 Promise.all([this.getApiData(tab, false), this.getApiData(tab, true)]).finally(() => (this.isLoading = false))
             },
-
+            getBuildResourceType () {
+                if (['THIRD_PARTY_AGENT_ID', 'THIRD_PARTY_AGENT_ENV'].includes(this.buildResourceType)) return 'PUBLIC_DEVCLOUD'
+                return this.buildResourceType
+            },
             getApiData (tab, recommendFlag) {
                 this.isLoadingMore = true
                 const postData = Object.assign({
                     projectCode: this.$route.params.projectId,
-                    agentType: this.buildResourceType,
+                    agentType: this.getBuildResourceType(),
                     recommendFlag
                 }, tab)
 
diff --git a/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/ContainerContent.vue b/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/ContainerContent.vue
index d3219570415..4d2cc513dbf 100644
--- a/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/ContainerContent.vue
+++ b/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/ContainerContent.vue
@@ -176,6 +176,20 @@
                     name="buildResource"
                 />
             </form-field>
+            
+            <form-field
+                v-if="isLinuxOsDockerImage"
+            >
+                <LinuxOsDockerImage
+                    :editable="editable"
+                    :container="container"
+                    :version-list="versionList"
+                    :is-version-loading="isVersionLoading"
+                    :image-type-list="imageTypeList"
+                    :choose-image="chooseImage"
+                    :handle-container-change="handleContainerChange"
+                />
+            </form-field>
 
             <!-- windows公共构建机类型 -->
             <template v-if="buildResourceType === 'WINDOWS'">
@@ -442,10 +456,9 @@
                 />
             </div>
         </div>
-
         <image-selector
             :is-show.sync="showImageSelector"
-            v-if="showImagePublicTypeList.includes(buildResourceType)"
+            v-if="showImagePublicTypeList.includes(buildResourceType) || isLinuxOsDockerImage"
             :code="buildImageCode"
             :build-resource-type="buildResourceType"
             @choose="choose"
@@ -462,6 +475,7 @@
     import EnumInput from '@/components/atomFormField/EnumInput'
     import Selector from '@/components/atomFormField/Selector'
     import VuexInput from '@/components/atomFormField/VuexInput'
+    import LinuxOsDockerImage from './LinuxOsDockerImage'
     import Vue from 'vue'
     import { mapActions, mapGetters } from 'vuex'
     import BuildParams from './BuildParams'
@@ -491,7 +505,8 @@
             AtomCheckbox,
             ImageSelector,
             SelectInput,
-            CustomEnvField
+            CustomEnvField,
+            LinuxOsDockerImage
         },
         props: {
             containerIndex: Number,
@@ -623,10 +638,10 @@
                 return this.container.dispatchType.imageType
             },
             isBkStoreImageType () {
-                return this.buildImageType === 'BKSTORE'
+                return this.buildImageType === 'BKSTORE' || this.linuxOsDockerBuildImageType === 'BKSTORE'
             },
             buildImageCode () {
-                return this.container.dispatchType && this.container.dispatchType.imageCode
+                return this.container?.dispatchType?.imageCode || this.container?.dispatchType?.dockerInfo?.storeImage?.imageCode
             },
             buildImageVersion () {
                 return this.container.dispatchType.imageVersion
@@ -700,6 +715,15 @@
                     })
                 })
                 return jobIdList
+            },
+            isLinuxOsDockerImage () {
+                return this.container.baseOS === 'LINUX' && ['THIRD_PARTY_AGENT_ID', 'THIRD_PARTY_AGENT_ENV'].includes(this.buildResourceType)
+            },
+            dockerInfo () {
+                return this.container.dispatchType?.dockerInfo || {}
+            },
+            linuxOsDockerBuildImageType () {
+                return this.container.dispatchType?.dockerInfo?.imageType
             }
         },
         watch: {
@@ -756,8 +780,8 @@
                     })
                 )
             }
-            if (this.container.dispatchType?.imageCode) {
-                this.getVersionList(this.container.dispatchType.imageCode)
+            if (this.buildImageCode) {
+                this.getVersionList(this.buildImageCode)
             }
             if (this.buildResourceType === 'MACOS') this.getMacOsData()
             if (this.buildResourceType === 'WINDOWS') this.getWinData()
@@ -792,13 +816,14 @@
                         imageName: defaultBuildResource.name || '',
                         imageType: defaultBuildResource.imageType || '',
                         recommendFlag: defaultBuildResource.recommendFlag,
+                        dockerInfo: {},
                         [name]: val
                     })
                 )
                 if (val === 'MACOS') this.getMacOsData()
                 if (val === 'WINDOWS') this.getWinData()
                 if (this.container.dispatchType?.imageCode) {
-                    this.getVersionList(this.container.dispatchType.imageCode)
+                    this.getVersionList(this.buildImageCode)
                 }
             },
 
@@ -813,40 +838,90 @@
             },
 
             changeImageVersion (value) {
-                this.handleContainerChange(
-                    'dispatchType',
-                    Object.assign({
-                        ...this.container.dispatchType,
-                        imageVersion: value,
-                        value: this.buildImageCode
-                    })
-                )
+                if (this.isLinuxOsDockerImage) {
+                    this.handleContainerChange(
+                        'dispatchType',
+                        Object.assign({
+                            ...this.container.dispatchType,
+                            dockerInfo: {
+                                ...this.container.dispatchType.dockerInfo,
+                                storeImage: {
+                                    ...this.container.dispatchType.dockerInfo.storeImage,
+                                    imageVersion: value
+                                }
+                            }
+                        })
+                    )
+                } else {
+                    this.handleContainerChange(
+                        'dispatchType',
+                        Object.assign({
+                            ...this.container.dispatchType,
+                            imageVersion: value,
+                            value: this.buildImageCode
+                        })
+                    )
+                }
             },
 
             choose (card) {
-                this.handleContainerChange(
-                    'dispatchType',
-                    Object.assign({
-                        ...this.container.dispatchType,
-                        imageCode: card.code,
-                        imageName: card.name,
-                        recommendFlag: card.recommendFlag
-                    })
-                )
-                return this.getVersionList(card.code).then(() => {
-                    let chooseVersion = this.versionList[0] || {}
-                    if (card.historyVersion) {
-                        chooseVersion
-                            = this.versionList.find((x) => x.versionValue === card.historyVersion) || {}
-                    }
+                if (this.isLinuxOsDockerImage) {
                     this.handleContainerChange(
                         'dispatchType',
                         Object.assign({
                             ...this.container.dispatchType,
-                            imageVersion: chooseVersion.versionValue,
-                            value: card.code
+                            recommendFlag: card.recommendFlag,
+                            dockerInfo: {
+                                ...this.container.dispatchType.dockerInfo,
+                                storeImage: {
+                                    imageCode: card.code,
+                                    imageName: card.name
+                                }
+                            }
                         })
                     )
+                } else {
+                    this.handleContainerChange(
+                        'dispatchType',
+                        Object.assign({
+                            ...this.container.dispatchType,
+                            imageCode: card.code,
+                            imageName: card.name,
+                            recommendFlag: card.recommendFlag
+                        })
+                    )
+                }
+                    
+                return this.getVersionList(card.code).then(() => {
+                    let chooseVersion = this.versionList[0] || {}
+                    if (card.historyVersion) {
+                        chooseVersion
+                            = this.versionList.find((x) => x.versionValue === card.historyVersion) || {}
+                    }
+                    if (this.isLinuxOsDockerImage) {
+                        this.handleContainerChange(
+                            'dispatchType',
+                            Object.assign({
+                                ...this.container.dispatchType,
+                                dockerInfo: {
+                                    ...this.container.dispatchType.dockerInfo,
+                                    storeImage: {
+                                        ...this.container.dispatchType.dockerInfo.storeImage,
+                                        imageVersion: chooseVersion.versionValue
+                                    }
+                                }
+                            })
+                        )
+                    } else {
+                        this.handleContainerChange(
+                            'dispatchType',
+                            Object.assign({
+                                ...this.container.dispatchType,
+                                imageVersion: chooseVersion.versionValue,
+                                value: card.code
+                            })
+                        )
+                    }
                 })
             },
 
@@ -1127,7 +1202,7 @@
             }
         }
         .image-tag {
-            width: 50%;
+            flex: 1;
         }
     }
 
diff --git a/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/LinuxOsDockerImage.vue b/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/LinuxOsDockerImage.vue
new file mode 100644
index 00000000000..9d1ccdff120
--- /dev/null
+++ b/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/LinuxOsDockerImage.vue
@@ -0,0 +1,379 @@
+<template>
+    <section>
+        <form-field>
+            <atom-checkbox
+                :value="enableDocker"
+                :text="$t('editPage.enableDocker')"
+                name="enableDocker"
+                :handle-change="val => handleeEnableDockerChange(val)"
+                :disabled="!editable"
+            >
+            </atom-checkbox>
+            <i
+                class="bk-icon icon-info-circle"
+                v-bk-tooltips="$t('editPage.enableDockerTips')"
+            ></i>
+        </form-field>
+        <section
+            class="linux-docker-image-container"
+            v-if="enableDocker"
+        >
+            <form-field
+                :label="$t('editPage.image')"
+                :required="true"
+                :is-error="errors.has('buildImageVersion') || errors.has('image')"
+                :error-msg="$t('editPage.imageErrMgs')"
+            >
+                <enum-input
+                    name="imageType"
+                    :list="imageTypeList"
+                    :disabled="!editable"
+                    :handle-change="changeImageType"
+                    :value="buildImageType"
+                >
+                </enum-input>
+                <section
+                    v-if="buildImageType === 'BKSTORE'"
+                    class="bk-image"
+                >
+                    <section class="image-name">
+                        <span
+                            :class="[
+                                { disable: !editable },
+                                { 'not-recommend': buildImageRecommendFlag === false },
+                                'image-named'
+                            ]"
+                            :title="buildImageRecommendFlag === false
+                                ? $t('editPage.notRecomendImage')
+                                : buildImageName
+                            "
+                        >{{ buildImageName || $t("editPage.chooseImage") }}</span>
+                        <bk-button
+                            theme="primary"
+                            @click.stop="chooseImage"
+                            :disabled="!editable"
+                        >
+                            {{
+                                buildImageCode ? $t("editPage.reElection") : $t("editPage.select")
+                            }}
+                        </bk-button>
+                    </section>
+                    <bk-select
+                        @change="changeImageVersion"
+                        :value="buildImageVersion"
+                        searchable
+                        class="image-tag"
+                        :loading="isVersionLoading"
+                        :disabled="!editable"
+                        v-validate.initial="'required'"
+                        name="buildImageVersion"
+                    >
+                        <bk-option
+                            v-for="option in versionList"
+                            :key="option.versionValue"
+                            :id="option.versionValue"
+                            :name="option.versionName"
+                        >
+                        </bk-option>
+                    </bk-select>
+                </section>
+                <bk-input
+                    v-else
+                    @change="val => changeDockerInfo('image', val)"
+                    :value="buildImage"
+                    :disabled="!editable"
+                    class="bk-image"
+                    :placeholder="$t('editPage.thirdImageHolder')"
+                    v-validate.initial="'required'"
+                    name="image"
+                ></bk-input>
+            </form-field>
+
+            <form-field
+                :label="$t('editPage.imageTicket')"
+                v-if="buildImageType === 'THIRD'"
+            >
+                <select-input
+                    v-bind="imageCredentialOption"
+                    :disabled="!editable"
+                    name="credential"
+                    :value="buildImageCredential"
+                    :handle-change="changeTicket"
+                ></select-input>
+            </form-field>
+
+            <form-field
+                :label="$t('editPage.imagePullPolicy')"
+                required
+            >
+                <enum-input
+                    name="imagePullPolicy"
+                    :list="policyList"
+                    :disabled="!editable"
+                    :handle-change="changeDockerInfo"
+                    :value="buildImagePullPolicy"
+                >
+                </enum-input>
+            </form-field>
+
+            <form-field
+                label="Volumes"
+            >
+                <input-parameter-array
+                    name="volumes"
+                    :value="buildVolumes"
+                    :handle-change="changeOptions"
+                />
+            </form-field>
+            <form-field
+                label="Mounts"
+            >
+                <input-parameter-array
+                    name="mounts"
+                    :value="buildMounts"
+                    :handle-change="changeOptions"
+                />
+            </form-field>
+
+            <form-field
+                label="Gpus"
+            >
+                <bk-input
+                    placeholder="all"
+                    :value="buildGpus"
+                    @change="(val) => changeOptions('gpus', val)"
+                />
+            </form-field>
+
+            <form-field>
+                <atom-checkbox
+                    :value="buildPrivileged"
+                    :text="$t('editPage.enabledPrivileged')"
+                    name="privileged"
+                    :handle-change="changeOptions"
+                    :disabled="!editable"
+                >
+                </atom-checkbox>
+            </form-field>
+        </section>
+    </section>
+</template>
+
+<script>
+    import FormField from '@/components/AtomPropertyPanel/FormField'
+    import EnumInput from '@/components/atomFormField/EnumInput'
+    import SelectInput from '@/components/AtomFormComponent/SelectInput'
+    import AtomCheckbox from '@/components/atomFormField/AtomCheckbox'
+    import InputParameterArray from '@/components/AtomFormComponent/InputParameterArray'
+    export default {
+        name: 'LinuxOsDockerImage',
+        components: {
+            FormField,
+            EnumInput,
+            SelectInput,
+            AtomCheckbox,
+            InputParameterArray
+        },
+        props: {
+            editable: {
+                type: Boolean,
+                default: false
+            },
+            container: {
+                type: Object,
+                default: () => {}
+            },
+            imageTypeList: {
+                type: Array,
+                default: () => []
+            },
+            versionList: {
+                type: Array,
+                default: () => []
+            },
+            isVersionLoading: {
+                type: Boolean,
+                default: false
+            },
+            chooseImage: {
+                type: Function,
+                required: true
+            },
+            handleContainerChange: {
+                type: Function,
+                required: true
+            }
+        },
+        data () {
+            return {
+                enableDocker: false
+            }
+        },
+        computed: {
+            projectId () {
+                return this.$route.params.projectId
+            },
+            buildImageCode () {
+                return this.container.dispatchType?.dockerInfo?.storeImage?.imageCode
+            },
+            buildImageVersion () {
+                return this.container.dispatchType?.dockerInfo?.storeImage?.imageVersion
+            },
+            buildImageName () {
+                return this.container.dispatchType?.dockerInfo?.storeImage?.imageName
+            },
+            dockerInfo () {
+                return this.container.dispatchType?.dockerInfo ?? {}
+            },
+            buildImageType () {
+                return this.container.dispatchType?.dockerInfo?.imageType ?? 'THIRD'
+            },
+            buildImageCredential () {
+                return this.container.dispatchType?.dockerInfo?.credential?.jobId ?? ''
+            },
+            buildImagePullPolicy () {
+                return this.container.dispatchType?.dockerInfo?.imagePullPolicy ?? 'always'
+            },
+            buildImage () {
+                return this.container.dispatchType?.dockerInfo?.image ?? ''
+            },
+            buildVolumes () {
+                return this.container.dispatchType?.dockerInfo?.options?.volumes ?? []
+            },
+            buildMounts () {
+                return this.container.dispatchType?.dockerInfo?.options?.mounts ?? []
+            },
+            buildGpus () {
+                return this.container.dispatchType?.dockerInfo?.options?.gpus ?? ''
+            },
+            buildPrivileged () {
+                return this.container.dispatchType?.dockerInfo?.options?.privileged ?? false
+            },
+            buildImageRecommendFlag () {
+                return this.container.dispatchType && this.container.dispatchType.recommendFlag
+            },
+            imageCredentialOption () {
+                return {
+                    optionsConf: {
+                        paramId: 'credentialId',
+                        paramName: 'credentialId',
+                        url: `/ticket/api/user/credentials/${this.projectId}/hasPermissionList?permission=USE&page=1&pageSize=1000&credentialTypes=USERNAME_PASSWORD`,
+                        hasAddItem: true,
+                        itemText: this.$t('editPage.addCredentials'),
+                        itemTargetUrl: `/ticket/${this.projectId}/createCredential/USERNAME_PASSWORD/true`
+                    }
+                }
+            },
+            policyList () {
+                return [
+                    { label: this.$t('editPage.alwaysPull'), value: 'always' },
+                    { label: this.$t('editPage.ifNotPresent'), value: 'if-not-present' }
+                ]
+            }
+        },
+        created () {
+            if (Object.keys(this.dockerInfo).length) this.enableDocker = true
+        },
+        methods: {
+            handleeEnableDockerChange () {
+                this.enableDocker = !this.enableDocker
+                const dockerInfo = this.enableDocker
+                    ? {
+                        imageType: 'THIRD'
+                    }
+                    : {}
+                this.handleContainerChange(
+                    'dispatchType',
+                    Object.assign({
+                        ...this.container.dispatchType,
+                        dockerInfo
+                    })
+                )
+            },
+
+            changeImageType (name, value) {
+                this.handleContainerChange(
+                    'dispatchType',
+                    Object.assign({
+                        ...this.container.dispatchType,
+                        dockerInfo: {
+                            ...this.container.dispatchType.dockerInfo,
+                            image: value === 'THIRD' ? this.container.dispatchType.dockerInfo.image : '',
+                            credential: value === 'THIRD' ? this.container.dispatchType.dockerInfo.credential : '',
+                            storeImage: value === 'THIRD' ? {} : this.container.dispatchType.dockerInfo.storeImage,
+                            [name]: value
+                        }
+                    })
+                )
+            },
+
+            changeDockerInfo (name, value) {
+                this.handleContainerChange(
+                    'dispatchType',
+                    Object.assign({
+                        ...this.container.dispatchType,
+                        dockerInfo: {
+                            ...this.container.dispatchType.dockerInfo,
+                            [name]: value
+                        }
+                    })
+                )
+            },
+
+            changeTicket (name, value) {
+                this.handleContainerChange(
+                    'dispatchType',
+                    Object.assign({
+                        ...this.container.dispatchType,
+                        dockerInfo: {
+                            ...this.container.dispatchType.dockerInfo,
+                            [name]: {
+                                jobId: value
+                            }
+                        }
+                    })
+                )
+            },
+
+            changeOptions (name, value) {
+                this.handleContainerChange(
+                    'dispatchType',
+                    Object.assign({
+                        ...this.container.dispatchType,
+                        dockerInfo: {
+                            ...this.container.dispatchType.dockerInfo,
+                            options: {
+                                ...this.container.dispatchType.dockerInfo.options,
+                                [name]: value
+                            }
+                        }
+                    })
+                )
+            },
+
+            changeImageVersion (value) {
+                this.handleContainerChange(
+                    'dispatchType',
+                    Object.assign({
+                        ...this.container.dispatchType,
+                        dockerInfo: {
+                            ...this.container.dispatchType.dockerInfo,
+                            storeImage: {
+                                ...this.container.dispatchType.dockerInfo.storeImage,
+                                imageVersion: value
+                            }
+                        }
+                    })
+                )
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .linux-docker-image-container {
+        padding: 5px 20px 15px;
+        margin-top: 10px;
+        background-color: #f5f7fa;
+    }
+</style>
diff --git a/src/frontend/devops-pipeline/src/components/atomFormField/EnumInput/index.vue b/src/frontend/devops-pipeline/src/components/atomFormField/EnumInput/index.vue
index 4fce92b939d..cd51ccebfc5 100755
--- a/src/frontend/devops-pipeline/src/components/atomFormField/EnumInput/index.vue
+++ b/src/frontend/devops-pipeline/src/components/atomFormField/EnumInput/index.vue
@@ -91,7 +91,7 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    width: 100%;
+    max-width: 540px;
     display: inline-block;
   }
   .tip-style {
diff --git a/src/frontend/devops-pipeline/src/store/modules/atom/getters.js b/src/frontend/devops-pipeline/src/store/modules/atom/getters.js
index 18b2f8ed6e7..aaa4fa41288 100755
--- a/src/frontend/devops-pipeline/src/store/modules/atom/getters.js
+++ b/src/frontend/devops-pipeline/src/store/modules/atom/getters.js
@@ -366,7 +366,7 @@ export default {
         return container && container.dispatchType && typeof container.dispatchType.buildType === 'string' && container.dispatchType.buildType === 'PUBLIC_BCS'
     },
     isThirdDockerContainer: state => container => {
-        return container?.dispatchType?.buildType?.indexOf('THIRD_PARTY_') > -1 && container?.dispatchType?.dockerInfo
+        return container?.dispatchType?.buildType?.indexOf('THIRD_PARTY_') > -1 && container?.dispatchType?.dockerInfo && Object.keys(container?.dispatchType?.dockerInfo).length
     },
     checkShowDebugDockerBtn: (state, getters) => (container, routeName, execDetail) => {
         const isDocker = getters.isDockerBuildResource(container)
diff --git a/src/frontend/locale/environment/en-US.json b/src/frontend/locale/environment/en-US.json
index 7b67aee1722..528737008ea 100644
--- a/src/frontend/locale/environment/en-US.json
+++ b/src/frontend/locale/environment/en-US.json
@@ -232,7 +232,8 @@
         "set": "Set",
         "remaining": "Remaining",
         "canApplyCount": "Can apply count",
-        "selectNewNode": "Select new Agent"
+        "selectNewNode": "Select new Agent",
+        "dockerMaxConcurrency": "Maximum Docker Build Concurrency"
     },
     "nodeTypeMap": {
         "CC": "CC",
diff --git a/src/frontend/locale/environment/zh-CN.json b/src/frontend/locale/environment/zh-CN.json
index 06d0922a8b7..3d70b2a1ba9 100644
--- a/src/frontend/locale/environment/zh-CN.json
+++ b/src/frontend/locale/environment/zh-CN.json
@@ -232,7 +232,8 @@
         "set": "台",
         "remaining": "还剩",
         "canApplyCount": "台可申请",
-        "selectNewNode": "请选择你的新节点"
+        "selectNewNode": "请选择你的新节点",
+        "dockerMaxConcurrency": "docker构建最大并发数"
     },
     "nodeTypeMap": {
         "CC": "CC",
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index 040957223d4..ed6c449a5b7 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -767,7 +767,7 @@
     "image": "Image",
     "provideInfo": "Provided by {0}, modified {1} on {2}",
     "officialCertification": "Official Certification",
-    "thirdImageHolder": "Please enter the full image path, such as docker.io/bkci/ci",
+    "thirdImageHolder": "Please enter the full image path, such as xxx.xxx.com/your-namespace/your-imagename:1.0",
     "by": "by",
     "devnet": "Devnet VM",
     "onlySupport": "Only supported",
@@ -1026,7 +1026,13 @@
     "timerTriggerCodelibTips": "- Git repository: Branch is optional, defaults to the default branch when not specified.\n-SVN repository: Branch is mandatory, must be a first-level subdirectory under the repository root path.",
     "timerTriggerBranchTips": "If multiple branches have changes, each branch will trigger once when conditions are met.",
     "filePathTips": "Please enter directory, e.g., /a",
-    "fileNameTips": "File name, leave blank to auto-detect"
+    "fileNameTips": "File name, leave blank to auto-detect",
+    "enableDocker": "Enable Docker for Running Build Tasks",
+    "imagePullPolicy": "Image Pull Policy",
+    "alwaysPull": "Always pull on each run",
+    "ifNotPresent": "Pull only if not present locally",
+    "enableDockerTips": "When using this feature, please ensure that the build machine has Docker installed, and that the user running the third-party build agent has the necessary permissions to operate Docker.",
+    "enabledPrivileged": "Enable Privileged Mode"
   },
   "storeMap": {
     "textarea": "Textarea",
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index c04ae0971c5..84dd5da0138 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -766,7 +766,7 @@
     "image": "镜像",
     "provideInfo": "{0} 提供，{1} 修改于 {2}",
     "officialCertification": "官方认证",
-    "thirdImageHolder": "请输入完整镜像路径，如 docker.io/bkci/ci",
+    "thirdImageHolder": "请输入完整镜像路径，如 xxx.xxx.com/your-namespace/your-imagename:1.0",
     "by": "由",
     "devnet": "Devnet 物理机",
     "onlySupport": "仅支持",
@@ -1025,7 +1025,13 @@
     "timerTriggerCodelibTips": "- Git 仓库，分支非必填，缺省时为默认分支\n- SVN 仓库，分支必填，为仓库根路径下的一级子目录",
     "timerTriggerBranchTips": "若多个分支均有变更，满足条件时每个分支将触发一次",
     "filePathTips": "请填写自定义仓库目录，如/a",
-    "fileNameTips": "文件名，留空则自动读取"
+    "fileNameTips": "文件名，留空则自动读取",
+    "enableDocker": "启用 Docker 运行构建任务",
+    "imagePullPolicy": "镜像拉取策略",
+    "alwaysPull": "每次运行时拉取",
+    "ifNotPresent": "当本地不存在时才拉取",
+    "enableDockerTips": "使用此功能时，请确保构建机已经安装Docker运行环境，且第三方构建机Agent的启动用户拥有Docker的操作权限",
+    "enabledPrivileged": "是否开启特权模式"
   },
   "storeMap": {
     "textarea": "文本框",