From a15a53a80ef6e68f297f843fbd778cb806b7d4dd Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Sun, 12 Dec 2021 14:23:50 +0100
Subject: [PATCH] [docker] remote Dockerfile-remote when not needed. Fixes #599

---
 .../main/java/org/jreleaser/tools/DockerToolProcessor.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/DockerToolProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/DockerToolProcessor.java
index c13b6a855..05151835d 100644
--- a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/DockerToolProcessor.java
+++ b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/DockerToolProcessor.java
@@ -81,6 +81,8 @@ protected void doPrepareDistribution(Distribution distribution,
                 Files.move(prepareDirectory.resolve("Dockerfile-remote"),
                     prepareDirectory.resolve("Dockerfile"),
                     REPLACE_EXISTING);
+            } else {
+                Files.deleteIfExists(prepareDirectory.resolve("Dockerfile-remote"));
             }
 
             return;
@@ -107,6 +109,8 @@ private void prepareSpec(Distribution distribution,
             Files.move(prepareDirectory.resolve(spec.getName()).resolve("Dockerfile-remote"),
                 prepareDirectory.resolve(spec.getName()).resolve("Dockerfile"),
                 REPLACE_EXISTING);
+        } else {
+            Files.deleteIfExists(prepareDirectory.resolve("Dockerfile-remote"));
         }
     }