第三方构建机DockerUi界面支持 TencentBlueKing#10962

tangruotian · Sep 18, 2024 · 6ab6574 · 6ab6574
1 parent c213537
commit 6ab6574
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/...pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/image/PoolType.kt b/...pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/image/PoolType.kt
@@ -147,6 +147,23 @@ enum class PoolType {
 
         private fun makeContainer(dockerInfo: ThirdPartyAgentDockerInfo?): Container3? {
             if (dockerInfo == null) return null
+            // 使用研发商店镜像的情况
+            if (dockerInfo.storeImage != null) {
+                return Container3(
+                    imageVersion = dockerInfo.storeImage?.imageVersion,
+                    imageCode = dockerInfo.storeImage?.imageCode,
+                    credentials = with(dockerInfo.credential) {
+                        when {
+                            this == null -> null
+                            credentialId != null -> dockerInfo.credential?.credentialId?.ifBlank { null }
+                            user != null && password != null -> Credentials(user!!, password!!)
+                            else -> null
+                        }
+                    },
+                    options = dockerInfo.options,
+                    imagePullPolicy = dockerInfo.imagePullPolicy
+                )
+            }
             return Container3(
                 image = dockerInfo.image,
                 credentials = with(dockerInfo.credential) {