(executor-service) Embed dist/ in executor-service's docker image

build.gradle

@@ -50,37 +50,6 @@ allprojects {
 
 }
 
-tasks.register('dist', Copy) {
-    from subprojects.collect { it.tasks.withType(Tar) }
-    into "$buildDir/dist"
-
-    // For local development, each processes that are to be triggerable
-    // from the control-service need to go here to end up somewhere the
-    // control-service can find them
-
-    doLast {
-        copy {
-            from tarTree("$buildDir/dist/converter-process.tar")
-            into "$projectDir/run/dist/"
-        }
-        copy {
-            from tarTree("$buildDir/dist/crawler-process.tar")
-            into "$projectDir/run/dist/"
-        }
-        copy {
-            from tarTree("$buildDir/dist/loader-process.tar")
-            into "$projectDir/run/dist/"
-        }
-        copy {
-            from tarTree("$buildDir/dist/website-adjacencies-calculator.tar")
-            into "$projectDir/run/dist/"
-        }
-        copy {
-            from tarTree("$buildDir/dist/index-construction-process.tar")
-            into "$projectDir/run/dist/"
-        }
-    }
-}
 idea {
     module {
         // Exclude these directories from being indexed by IntelliJ
@@ -98,7 +67,6 @@ idea {
         excludeDirs.add(file("$projectDir/run/test-data"))
     }
 }
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(21))

code/processes/website-adjacencies-calculator/build.gradle

@@ -4,17 +4,18 @@ plugins {
     id 'application'
     id 'jvm-test-suite'
 }
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
 
 application {
     mainClass = 'nu.marginalia.adjacencies.WebsiteAdjacenciesCalculator'
     applicationName = 'website-adjacencies-calculator'
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
+tasks.distZip.enabled = false
 
 dependencies {
     implementation project(':code:common:model')
@@ -34,8 +35,3 @@ dependencies {
     testImplementation libs.bundles.junit
     testImplementation libs.mockito
 }
-
-configurations {
-    e2eTestImplementation.extendsFrom(testImplementation)
-
-}

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

@@ -13,7 +13,7 @@ application {
 
 tasks.distZip.enabled = false
 
-apply from: "$rootProject.projectDir/docker-service.gradle"
+apply from: "$rootProject.projectDir/docker-service-with-dist.gradle"
 
 java {
     toolchain {
@@ -64,4 +64,3 @@ dependencies {
 
 
 }
-

docker-service-with-dist.gradle

@@ -0,0 +1,68 @@
+ext {
+    dockerImage='openjdk:21-slim'
+    serviceJvmOpts='--enable-preview -ea ${wmsa_jvm_param} -Dservice-host=0.0.0.0  -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=4000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false'
+    serviceToolOpts='--enable-preview -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000'
+}
+
+tasks.register('dockerFile') {
+    buildDir.mkdir()
+
+    var df = new File(buildDir, "Dockerfile")
+    doLast {
+        df.text = """#
+# I'm auto-generated, please don't make changes to me or commit me to git
+#
+# The template exists in docker-service.gradle
+#
+FROM ${dockerImage}
+
+ADD ${application.applicationName}.tar /
+ADD crawler-process.tar /dist
+ADD loader-process.tar /dist
+ADD converter-process.tar /dist
+ADD website-adjacencies-calculator.tar /dist
+ADD index-construction-process.tar /dist
+
+RUN mkdir /wmsa
+
+ENV JAVA_TOOL_OPTIONS="${serviceToolOpts}"
+ENV JAVA_OPTS="${serviceJvmOpts} "
+
+ENTRYPOINT WMSA_HOME=/wmsa /${application.applicationName}/bin/${application.applicationName} \${arg0} \${arg1}
+"""
+    }
+    it.outputs.file(df)
+}
+
+dockerPrepare {
+    dependsOn tasks.dockerFile
+
+    dependsOn project(':code:processes:website-adjacencies-calculator').distTar
+    dependsOn project(':code:processes:crawling-process').distTar
+    dependsOn project(':code:processes:loading-process').distTar
+    dependsOn project(':code:processes:converting-process').distTar
+    dependsOn project(':code:processes:index-constructor-process').distTar
+}
+
+dockerfileZip {
+    dependsOn tasks.dockerFile
+}
+
+docker {
+    dockerfile = tasks.dockerFile.outputs.files.singleFile
+    name = 'marginalia.nu/'+application.applicationName+':latest'
+    files tasks.distTar.outputs, \
+         project(':code:processes:crawling-process').distTar.outputs, \
+         project(':code:processes:loading-process').distTar.outputs, \
+         project(':code:processes:converting-process').distTar.outputs, \
+         project(':code:processes:index-constructor-process').distTar.outputs, \
+         project(':code:processes:website-adjacencies-calculator').distTar.outputs
+
+    tags 'latest'
+
+    dependsOn project(':code:processes:crawling-process').distTar
+    dependsOn project(':code:processes:loading-process').distTar
+    dependsOn project(':code:processes:converting-process').distTar
+    dependsOn project(':code:processes:index-constructor-process').distTar
+    dependsOn project(':code:processes:website-adjacencies-calculator').distTar
+}

settings.gradle

@@ -67,6 +67,7 @@ include 'code:processes:crawling-process'
 include 'code:processes:loading-process'
 include 'code:processes:index-constructor-process'
 include 'code:processes:test-data'
+include 'code:processes:website-adjacencies-calculator'
 
 include 'code:process-models:crawling-model'
 include 'code:process-models:work-log'
@@ -75,7 +76,6 @@ include 'code:process-models:processed-data'
 
 include 'code:tools:term-frequency-extractor'
 include 'code:tools:experiment-runner'
-include 'code:tools:website-adjacencies-calculator'
 include 'code:tools:screenshot-capture-tool'
 include 'code:tools:load-test'
 include 'code:tools:stackexchange-converter'