Merge pull request TencentBlueKing#5465 from sawyersong2/issue5408_gi…

…thub_branch feat: dockerhsot 增加对bazel的支持 TencentBlueKing#5408
royalhuang · Nov 2, 2021 · 82535fc · 82535fc
2 parents cfd7536 + 891563f
commit 82535fc
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...otlin/com/tencent/devops/dockerhost/services/generator/impl/SystemDockerMountGenerator.kt b/...otlin/com/tencent/devops/dockerhost/services/generator/impl/SystemDockerMountGenerator.kt
@@ -47,13 +47,13 @@ class SystemDockerMountGenerator @Autowired constructor(private val dockerHostCo
     override fun generateMounts(handlerContext: ContainerHandlerContext): List<Mount> {
         with(handlerContext) {
             val mountList = mutableListOf<Mount>()
-            mountList.add(getBazelOverlayfsMount(
-                pipelineId = pipelineId,
-                vmSeqId = vmSeqId,
-                poolNo = poolNo
-            ))
-
             if (qpcUniquePath != null && qpcUniquePath.isNotBlank()) {
+                mountList.add(getBazelOverlayfsMount(
+                    pipelineId = pipelineId,
+                    vmSeqId = vmSeqId,
+                    poolNo = poolNo
+                ))
+
                 val upperDir = "${getWorkspace(pipelineId, vmSeqId, poolNo, dockerHostConfig.hostPathWorkspace!!)}upper"
                 val workDir = "${getWorkspace(pipelineId, vmSeqId, poolNo, dockerHostConfig.hostPathWorkspace!!)}work"
                 val lowerDir = "${dockerHostConfig.hostPathOverlayfsCache}/$qpcUniquePath"