fix: use containerImage istead of DEFAULT_IMAGE when no image in options

kestra-io · Aug 8, 2024 · 2b861aa · 2b861aa
1 parent e5ef5b3
commit 2b861aa
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Commands.java b/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Commands.java
@@ -65,7 +65,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Script.java b/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Script.java
@@ -69,7 +69,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Commands.java b/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Commands.java
@@ -62,7 +62,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Script.java b/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Script.java
@@ -127,7 +127,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Commands.java b/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Commands.java
@@ -67,7 +67,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
         if (original.getEntryPoint() == null) {
             builder.entryPoint(Collections.emptyList());

diff --git a/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Script.java b/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Script.java
@@ -80,7 +80,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Commands.java b/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Commands.java
@@ -245,7 +245,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Script.java b/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Script.java
@@ -116,7 +116,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Commands.java b/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Commands.java
@@ -63,7 +63,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Script.java b/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Script.java
@@ -119,7 +119,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-ruby/src/main/java/io/kestra/plugin/scripts/ruby/Commands.java b/plugin-script-ruby/src/main/java/io/kestra/plugin/scripts/ruby/Commands.java
@@ -98,7 +98,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-ruby/src/main/java/io/kestra/plugin/scripts/ruby/Script.java b/plugin-script-ruby/src/main/java/io/kestra/plugin/scripts/ruby/Script.java
@@ -104,7 +104,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Commands.java b/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Commands.java
@@ -109,7 +109,7 @@ public class Commands extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();

diff --git a/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Script.java b/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Script.java
@@ -83,7 +83,7 @@ public class Script extends AbstractExecScript {
     protected DockerOptions injectDefaults(DockerOptions original) {
         var builder = original.toBuilder();
         if (original.getImage() == null) {
-            builder.image(DEFAULT_IMAGE);
+            builder.image(this.getContainerImage());
         }
 
         return builder.build();