Fix empty RUN command (#757)

Fixes #756
micronaut-projects · Jun 30, 2023 · c0e0f27 · c0e0f27
1 parent b35f563
commit c0e0f27
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java b/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java
@@ -476,7 +476,7 @@ private void setupInstructions(List<Instruction> additionalInstructions) {
                     if (baseImageProvider.get().getImage().contains("alpine-glibc")) {
                         return "apk --no-cache update && apk add libstdc++";
                     }
-                    return "";
+                    return null;
                 }));
                 exposePort(getExposedPorts());
                 getInstructions().addAll(additionalInstructions);

diff --git a/...tional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy b/...tional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy
@@ -778,5 +778,44 @@ ENTRYPOINT ["java", "-jar", "/home/app/application.jar"]
 
     }
 
+    @Issue("https://github.com/micronaut-projects/micronaut-gradle-plugin/issues/756")
+    def "should not generate empty RUN command"() {
+        given:
+        settingsFile << "rootProject.name = 'hello-world'"
+        buildFile << """
+            plugins {
+                id "io.micronaut.minimal.application"
+                id "io.micronaut.docker"
+                id "io.micronaut.graalvm"
+            }
+
+            micronaut {
+                version "3.4.0"
+
+                runtime "netty"
+            }
+
+            $repositoriesBlock
+
+            application {
+                mainClass.set("com.example.Application")
+            }
+
+            tasks.named("dockerfileNative") {
+                baseImage('ubuntu:22.04')
+                instruction 'RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*'
+                instruction 'HEALTHCHECK CMD curl -s localhost:8080/endpoints/health | grep \\'"status":"UP"\\''
+            }
+            
+        """
+
+        when:
+        def result = build('dockerfileNative')
+        def dockerFileNative = new File(testProjectDir.root, 'build/docker/native-main/DockerfileNative').readLines('UTF-8')
+        def emptyRunLines = dockerFileNative.findAll { it == "RUN " }
+
+        then:
+        emptyRunLines.isEmpty()
+    }
 
 }