Fix image properties applied on task configuration

quarkusio · Sep 1, 2024 · a25cab5 · a25cab5
1 parent 2c1cdd9
commit a25cab5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...ls/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/ImageBuild.java b/...ls/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/ImageBuild.java
@@ -6,6 +6,7 @@
 import javax.inject.Inject;
 
 import org.gradle.api.provider.MapProperty;
+import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.options.Option;
 
 public abstract class ImageBuild extends ImageTask {
@@ -20,8 +21,14 @@ public void setBuilder(Builder builder) {
     @Inject
     public ImageBuild() {
         super("Perform an image build");
+    }
+
+    @TaskAction
+    @Override
+    public void checkRequiredExtensions() {
         MapProperty<String, String> forcedProperties = extension().forcedPropertiesProperty();
         forcedProperties.put(QUARKUS_CONTAINER_IMAGE_BUILD, "true");
         forcedProperties.put(QUARKUS_CONTAINER_IMAGE_BUILDER, getProject().provider(() -> builder().name()));
+        super.checkRequiredExtensions();
     }
 }
diff --git a/...ols/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/ImagePush.java b/...ols/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/ImagePush.java
@@ -15,13 +15,13 @@ public abstract class ImagePush extends ImageTask {
     @Inject
     public ImagePush() {
         super("Perform an image push");
-        MapProperty<String, String> forcedProperties = extension().forcedPropertiesProperty();
-        forcedProperties.put(QUARKUS_CONTAINER_IMAGE_BUILD, "true");
-        forcedProperties.put(QUARKUS_CONTAINER_IMAGE_PUSH, "true");
     }
 
     @TaskAction
     public void checkRequiredExtensions() {
+        MapProperty<String, String> forcedProperties = extension().forcedPropertiesProperty();
+        forcedProperties.put(QUARKUS_CONTAINER_IMAGE_BUILD, "true");
+        forcedProperties.put(QUARKUS_CONTAINER_IMAGE_PUSH, "true");
         List<String> containerImageExtensions = getProject().getConfigurations().stream()
                 .flatMap(c -> c.getDependencies().stream())
                 .map(d -> d.getName())