(gradle) Add task alias 'docker' for 'jibDockerBuild'

The change also moves the jib boilerplate to an include.

code/services-application/api-service/build.gradle

@@ -19,23 +19,8 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
-
-
 apply from: "$rootProject.projectDir/srcsets.gradle"
+apply from: "$rootProject.projectDir/docker.gradle"
 
 dependencies {
     implementation project(':code:common:db')

code/services-application/dating-service/build.gradle

@@ -13,21 +13,7 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
+apply from: "$rootProject.projectDir/docker.gradle"
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
 
 
 java {

code/services-application/explorer-service/build.gradle

@@ -13,21 +13,7 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
+apply from: "$rootProject.projectDir/docker.gradle"
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
 
 
 java {

code/services-application/search-service/build.gradle

@@ -8,21 +8,6 @@ plugins {
     id 'com.google.cloud.tools.jib' version '3.4.0'
 }
 
-jib {
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
-
 application {
     mainClass = 'nu.marginalia.search.SearchMain'
     applicationName = 'search-service'
@@ -43,6 +28,7 @@ sass {
 }
 
 apply from: "$rootProject.projectDir/srcsets.gradle"
+apply from: "$rootProject.projectDir/docker.gradle"
 
 dependencies {
     implementation project(':code:common:db')

code/services-core/assistant-service/build.gradle

@@ -13,23 +13,6 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
-
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(21))
@@ -37,6 +20,7 @@ java {
 }
 
 apply from: "$rootProject.projectDir/srcsets.gradle"
+apply from: "$rootProject.projectDir/docker.gradle"
 
 dependencies {
     implementation project(':third-party:symspell')

code/services-core/control-service/build.gradle

@@ -18,21 +18,7 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
+apply from: "$rootProject.projectDir/docker.gradle"
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
 
 
 apply from: "$rootProject.projectDir/srcsets.gradle"

code/services-core/executor-service/build.gradle

@@ -13,20 +13,7 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
+
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
 
 java {
     toolchain {
@@ -35,7 +22,7 @@ java {
 }
 
 apply from: "$rootProject.projectDir/srcsets.gradle"
-
+apply from: "$rootProject.projectDir/docker.gradle"
 dependencies {
     // These look weird but they're needed to be able to spawn the processes
     // from the executor service

code/services-core/index-service/build.gradle

@@ -13,21 +13,7 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
+apply from: "$rootProject.projectDir/docker.gradle"
-    from {
-        image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = [ rootProject.ext.dockerImageTag ]
-    }
-    container {
-
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
 
 
 java {

code/services-core/query-service/build.gradle

@@ -13,21 +13,7 @@ application {
 
 tasks.distZip.enabled = false
 
-jib {
+apply from: "$rootProject.projectDir/docker.gradle"
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
 
 
 java {

code/tools/screenshot-capture-tool/build.gradle

@@ -17,25 +17,11 @@ application {
     applicationName = 'screenshot-capture-tool'
 }
 
-jib {
-    from {
-        image = image = rootProject.ext.dockerImageBase
-    }
-    to {
-        image = rootProject.ext.dockerImageRegistry+'/'+project.name
-        tags = ['latest']
-    }
-    container {
-        mainClass = application.mainClass
-        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
-        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
-    }
-}
-
 
 tasks.distZip.enabled = false
 
 apply from: "$rootProject.projectDir/srcsets.gradle"
+apply from: "$rootProject.projectDir/docker.gradle"
 
 dependencies {
     implementation project(':code:common:model')

docker.gradle

@@ -0,0 +1,18 @@
+jib {
+    from {
+        image = image = rootProject.ext.dockerImageBase
+    }
+    to {
+        image = rootProject.ext.dockerImageRegistry+'/'+project.name
+        tags = ['latest']
+    }
+    container {
+        mainClass = application.mainClass
+        jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
+        volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
+    }
+}
+
+tasks.register('docker', {
+    dependsOn('jibDockerBuild')
+})