From c2f9980ebafcc43b49227811756da29298dddc79 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Sat, 11 Mar 2023 12:13:53 +0100
Subject: [PATCH] Tidy up.

---
 docker-service.gradle | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/docker-service.gradle b/docker-service.gradle
index 15086ce7..9f8f1bbe 100644
--- a/docker-service.gradle
+++ b/docker-service.gradle
@@ -4,12 +4,10 @@ ext {
     serviceToolOpts='-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000'
 }
 
-tasks.register('dockerFile') {
-    buildDir.mkdir()
-
+docker {
     var df = new File(buildDir, "Dockerfile")
-    doLast {
-        df.text = """#
+
+    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
@@ -24,23 +22,11 @@ ENV JAVA_OPTS="${serviceJvmOpts} "
 
 ENTRYPOINT WMSA_HOME=/wmsa /${application.applicationName}/bin/${application.applicationName} \${arg0} \${arg1}
 """
-    }
-    it.outputs.file(df)
-}
 
-dockerPrepare {
-    dependsOn tasks.dockerFile
-}
-
-dockerfileZip {
-    dependsOn tasks.dockerFile
-}
-
-
-docker {
-    dockerfile = tasks.dockerFile.outputs.files.singleFile
+    dockerfile = new File(buildDir, "Dockerfile")
     name = 'marginalia.nu/'+application.applicationName+':latest'
     files tasks.distTar.outputs
     tags 'latest'
+
     dependsOn tasks.distTar
 }