change build_and_push_images and depend on other task for building

boudicca-events · Oct 7, 2023 · 165aa62 · 165aa62
1 parent aa6a06a
commit 165aa62
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/build_and_push_images.sh b/build_and_push_images.sh
@@ -2,15 +2,19 @@
 
 ./gradlew imageBuild
 
-#quarkus is stupid and does not allow me to make simple names
 docker tag boudicca-eventdb registry.slothyx.com/boudicca-eventdb
 docker tag boudicca-search registry.slothyx.com/boudicca-search
 docker tag boudicca-html registry.slothyx.com/boudicca-html
 docker tag boudicca-ical registry.slothyx.com/boudicca-ical
 docker tag boudicca-eventcollectors registry.slothyx.com/boudicca-eventcollectors
 
+echo "pushing eventdb"
 docker push registry.slothyx.com/boudicca-eventdb
+echo "pushing search"
 docker push registry.slothyx.com/boudicca-search
+echo "pushing html"
 docker push registry.slothyx.com/boudicca-html
+echo "pushing ical"
 docker push registry.slothyx.com/boudicca-ical
+echo "pushing eventcollectors"
 docker push registry.slothyx.com/boudicca-eventcollectors
diff --git a/eventdb/build.gradle.kts b/eventdb/build.gradle.kts
@@ -41,6 +41,6 @@ tasks.withType<Test> {
 
 task<Exec>("imageBuild") {
     inputs.file("src/main/docker/Dockerfile")
-    dependsOn(tasks.withType<BootJar>())
+    dependsOn(tasks.withType<Assemble>())
     commandLine("docker", "build", "-t", "boudicca-eventdb", "-f", "src/main/docker/Dockerfile", ".")
 }
diff --git a/publisher-html/build.gradle.kts b/publisher-html/build.gradle.kts
@@ -49,6 +49,6 @@ tasks.withType<Jar> {
 
 task<Exec>("imageBuild") {
 	inputs.file("src/main/docker/Dockerfile")
-	dependsOn(tasks.withType<BootJar>())
+	dependsOn(tasks.withType<Assemble>())
 	commandLine("docker", "build", "-t", "boudicca-html", "-f", "src/main/docker/Dockerfile", ".")
 }
diff --git a/publisher-ical/build.gradle.kts b/publisher-ical/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 plugins {
     id("org.springframework.boot") version "3.1.4"
@@ -46,6 +45,6 @@ tasks.withType<Test> {
 
 task<Exec>("imageBuild") {
     inputs.file("src/main/docker/Dockerfile")
-    dependsOn(tasks.withType<BootJar>())
+    dependsOn(tasks.findByPath("assemble"))
     commandLine("docker", "build", "-t", "boudicca-ical", "-f", "src/main/docker/Dockerfile", ".")
 }
diff --git a/search/build.gradle.kts b/search/build.gradle.kts
@@ -41,6 +41,6 @@ tasks.withType<Test> {
 
 task<Exec>("imageBuild") {
     inputs.file("src/main/docker/Dockerfile")
-    dependsOn(tasks.withType<BootJar>())
+    dependsOn(tasks.withType<Assemble>())
     commandLine("docker", "build", "-t", "boudicca-search", "-f", "src/main/docker/Dockerfile", ".")
 }