diff --git a/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy b/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy index d8db63a776..4cc6523f53 100644 --- a/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy +++ b/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy @@ -16,6 +16,8 @@ package nextflow.cloud.azure.batch +import static com.microsoft.azure.batch.protocol.models.ContainerType.DOCKER_COMPATIBLE + import java.math.RoundingMode import java.nio.file.Path import java.time.Instant @@ -37,7 +39,6 @@ import com.microsoft.azure.batch.protocol.models.CloudTask import com.microsoft.azure.batch.protocol.models.ComputeNodeFillType import com.microsoft.azure.batch.protocol.models.ContainerConfiguration import com.microsoft.azure.batch.protocol.models.ContainerRegistry -import com.microsoft.azure.batch.protocol.models.ContainerType import com.microsoft.azure.batch.protocol.models.ElevationLevel import com.microsoft.azure.batch.protocol.models.ImageInformation import com.microsoft.azure.batch.protocol.models.JobUpdateParameter @@ -88,8 +89,6 @@ import nextflow.util.MemoryUnit import nextflow.util.MustacheTemplateEngine import nextflow.util.Rnd import org.joda.time.Period - -import static com.microsoft.azure.batch.protocol.models.ContainerType.DOCKER_COMPATIBLE /** * Implements Azure Batch operations for Nextflow executor * @@ -661,7 +660,7 @@ class AzBatchService implements Closeable { * * https://github.com/MicrosoftDocs/azure-docs/blob/master/articles/batch/batch-docker-container-workloads.md#:~:text=Run%20container%20applications%20on%20Azure,compatible%20containers%20on%20the%20nodes. */ - final containerConfig = new ContainerConfiguration(); + final containerConfig = new ContainerConfiguration().withType(DOCKER_COMPATIBLE); final registryOpts = config.registry() if( registryOpts && registryOpts.isConfigured() ) { @@ -670,7 +669,7 @@ class AzBatchService implements Closeable { .withRegistryServer(registryOpts.server) .withUserName(registryOpts.userName) .withPassword(registryOpts.password) - containerConfig.withContainerRegistries(containerRegistries).withType(DOCKER_COMPATIBLE) + containerConfig.withContainerRegistries(containerRegistries) log.debug "[AZURE BATCH] Connecting Azure Batch pool to Container Registry '$registryOpts.server'" }