bkdevops-projects · stubenhuang · Mar 3, 2022 · Mar 3, 2022
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,6 +18,7 @@ allprojects {
     repositories {
         mavenCentral()
         jcenter()
+        gradlePluginPortal()
     }
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,4 +9,4 @@ repositories {
 
 kotlinDslPluginOptions {
     experimentalWarning.set(false)
-}
+}
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -6,6 +6,7 @@ object Libs {
     const val DependencyManagement = "io.spring.gradle:dependency-management-plugin:${Versions.DependencyManagement}"
     const val KotlinSpringGradlePlugin = "org.jetbrains.kotlin:kotlin-allopen:${Versions.Kotlin}"
     const val KtLint = "com.pinterest:ktlint:${Versions.KtLint}"
+    const val GoogleJibPlugin = "gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:${Versions.Jib}"
 }
 
 object MavenBom {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -4,6 +4,7 @@ object Release {
 }
 
 object Versions {
+    const val Jib: String = "3.2.0"
     const val Java = "1.8"
     const val Kotlin = "1.4.32"
     const val SpringBoot = "2.4.5"

diff --git a/devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/build.gradle.kts b/devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     implementation(Libs.SpringBootGradlePlugin)
     implementation(Libs.DependencyManagement)
     implementation(Libs.KotlinSpringGradlePlugin)
+    implementation(Libs.GoogleJibPlugin)
     implementation(Libs.KtLint) {
         // ktlint 引用了1.4.31版本，和项目引入的1.4.32有冲突
         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")

diff --git a/...ot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/DevOpsBootPlugin.kt b/...ot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/DevOpsBootPlugin.kt
@@ -1,5 +1,6 @@
 package com.tencent.devops
 
+import com.tencent.devops.conventions.GoogleJibConvention
 import com.tencent.devops.conventions.JUnitConvention
 import com.tencent.devops.conventions.JavaConvention
 import com.tencent.devops.conventions.KotlinConvention
@@ -26,6 +27,8 @@ class DevOpsBootPlugin : Plugin<Project> {
         }
         // add dependencyManagement
         RepositoryConvention().apply(project)
+        // add jib to build container images
+        GoogleJibConvention().apply(project)
     }
 
     /**

diff --git a/...-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/conventions/GoogleJibConvention.kt b/...-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/conventions/GoogleJibConvention.kt
@@ -0,0 +1,38 @@
+package com.tencent.devops.conventions
+
+import com.google.cloud.tools.jib.gradle.BuildImageTask
+import com.google.cloud.tools.jib.gradle.JibExtension
+import com.google.cloud.tools.jib.gradle.JibPlugin
+import com.tencent.devops.enums.AssemblyMode
+import com.tencent.devops.utils.findPropertyOrEmpty
+import com.tencent.devops.utils.resolveAssemblyMode
+import org.gradle.api.Project
+import org.slf4j.LoggerFactory
+
+/**
+ * Google Jib 插件配置
+ */
+class GoogleJibConvention {
+
+    fun apply(project: Project) {
+        if (project.findPropertyOrEmpty("devops.jib") != "true") {
+            logger.debug("devops.jib is not true , google convention is disabled")
+            return
+        }
+
+        if (resolveAssemblyMode(project) != AssemblyMode.KUBERNETES) {
+            logger.warn("Google Jib Convention is failed , project must use KUBERNETES Mode")
+            return
+        }
+
+        with(project) {
+            pluginManager.apply(JibPlugin::class.java)
+            logger.debug("Apply GoogleJibConvention success!")
+        }
+
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(GoogleJibConvention::class.java)
+    }
+}
diff --git a/...oot-gradle-plugin/src/main/kotlin/com/tencent/devops/conventions/SpringCloudConvention.kt b/...oot-gradle-plugin/src/main/kotlin/com/tencent/devops/conventions/SpringCloudConvention.kt
@@ -1,6 +1,7 @@
 package com.tencent.devops.conventions
 
-import com.tencent.devops.utils.findPropertyOrEmpty
+import com.tencent.devops.enums.AssemblyMode
+import com.tencent.devops.utils.resolveAssemblyMode
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.utils.IMPLEMENTATION
 
@@ -16,16 +17,6 @@ class SpringCloudConvention {
         }
     }
 
-    /**
-     * 解析打包模式
-     */
-    private fun resolveAssemblyMode(project: Project): AssemblyMode {
-        val property = project.findPropertyOrEmpty(ASSEMBLY_MODE).trim()
-        return AssemblyMode.ofValueOrDefault(property).apply {
-            println("Project[${project.name}] assembly mode: $this")
-        }
-    }
-
     /**
      * 添加微服务相关依赖项
      */
@@ -43,11 +34,6 @@ class SpringCloudConvention {
     }
 
     companion object {
-        /**
-         * 打包模式
-         */
-        private const val ASSEMBLY_MODE = "devops.assemblyMode"
-
         /**
          * consul依赖
          */
@@ -61,16 +47,3 @@ class SpringCloudConvention {
         private const val K8S_DISCOVERY = "org.springframework.cloud:spring-cloud-starter-kubernetes-client-config"
     }
 }
-
-enum class AssemblyMode {
-    CONSUL,
-    K8S,
-    KUBERNETES;
-
-    companion object {
-        fun ofValueOrDefault(value: String): AssemblyMode {
-            val upperCase = value.toUpperCase()
-            return values().find { it.name == upperCase } ?: CONSUL
-        }
-    }
-}
diff --git a/...-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/enums/AssemblyMode.kt b/...-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/enums/AssemblyMode.kt
@@ -0,0 +1,14 @@
+package com.tencent.devops.enums
+
+enum class AssemblyMode {
+    CONSUL,
+    K8S,
+    KUBERNETES;
+
+    companion object {
+        fun ofValueOrDefault(value: String): AssemblyMode {
+            val upperCase = value.toUpperCase()
+            return values().find { it.name == upperCase } ?: CONSUL
+        }
+    }
+}
diff --git a/...oot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/utils/Constants.kt b/...oot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/utils/Constants.kt
@@ -1,5 +1,7 @@
 package com.tencent.devops.utils
 
+import com.tencent.devops.conventions.SpringCloudConvention
+import com.tencent.devops.enums.AssemblyMode
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
@@ -68,3 +70,13 @@ fun Project.findPropertyOrEmpty(name: String): String {
 fun Project.findPropertyOrDefault(name: String, default: String): String {
     return findPropertyOrNull(name) ?: default
 }
+
+/**
+ * 判断构建模式
+ */
+fun resolveAssemblyMode(project: Project): AssemblyMode {
+    val property = project.findPropertyOrEmpty("devops.assemblyMode").trim()
+    return AssemblyMode.ofValueOrDefault(property).apply {
+        println("Project[${project.name}] assembly mode: $this")
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ repositories { @@
     kotlinDslPluginOptions {
         experimentalWarning.set(false)
-    }
+    }