Merge pull request #10 from IntershopCommunicationsAG/extendconf

Add additional buildargs (2)
IntershopCommunicationsAG · Jul 7, 2020 · bbe887c · bbe887c
2 parents 5685bd0 + 296357c
commit bbe887c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/main/kotlin/com/intershop/gradle/icm/docker/ICMDockerPlugin.kt b/src/main/kotlin/com/intershop/gradle/icm/docker/ICMDockerPlugin.kt
@@ -131,14 +131,16 @@ open class ICMDockerPlugin: Plugin<Project> {
                 })
             }
 
-                buildArgs.put( "SETUP_IMAGE", imgs.icmsetup )
+            buildArgs.put( "SETUP_IMAGE", imgs.icmsetup )
+            buildArgs.put( "ICM_BASE_IMAGE", imgs.icmbase)
+            buildArgs.put( "ICM_INIT_IMAGE", imgs.icminit)
 
-                images.set(project.provider {
-                    val nameExt = imgConf.nameExtension.get()
-                    val nameComplete = if(nameExt.isNotEmpty()) { "-$nameExt" } else { "" }
-                    mutableListOf("${imgBuild.baseImageName.get()}${nameComplete}:${project.version}")
-                })
-            }
+            images.set(project.provider {
+                val nameExt = imgConf.nameExtension.get()
+                val nameComplete = if(nameExt.isNotEmpty()) { "-$nameExt" } else { "" }
+                mutableListOf("${imgBuild.baseImageName.get()}${nameComplete}:${project.version}")
+            })
+        }
     }
 
     private fun createTestImageTask(project: Project,
@@ -158,7 +160,10 @@ open class ICMDockerPlugin: Plugin<Project> {
             }
 
             buildArgs.put( "SETUP_IMAGE", imgs.icmsetup )
+            buildArgs.put( "ICM_BASE_IMAGE", imgs.icmbase)
+            buildArgs.put( "ICM_INIT_IMAGE", imgs.icminit)
             buildArgs.put( "BASE_IMAGE", project.provider { imgTask.images.get().first() })
+
             images.set(project.provider {
                 val nameExt = imgConf.nameExtension.get()
                 val nameComplete = if(nameExt.isNotEmpty()) { "-$nameExt" } else { "" }

diff --git a/src/main/kotlin/com/intershop/gradle/icm/docker/extension/Images.kt b/src/main/kotlin/com/intershop/gradle/icm/docker/extension/Images.kt
@@ -40,4 +40,10 @@ open class Images @Inject constructor(objectFactory: ObjectFactory) {
     val icminit: Property<String> = objectFactory.property(String::class.java)
 
     val mssqldb: Property<String> = objectFactory.property(String::class.java)
+
+    init {
+        icmsetup.convention("")
+        icmbase.convention("")
+        icminit.convention("")
+    }
 }