From bdde49558530421589c4db6c1546bad3cc071015 Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Wed, 30 Sep 2026 19:29:31 +0200 Subject: [PATCH 1/3] Add conda/micromamba:v3 to the --build-template help The option passes the value to Wave as is, so the new template works without code changes. List it in the help text and the README, and fix the README, which still called conda/micromamba:v1 the default. Co-Authored-By: Claude Opus 5.5 --- README.md | 5 +++-- app/src/main/java/io/seqera/wave/cli/App.java | 2 +- app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy | 9 ++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b405166..89e7039 100644 --- a/README.md +++ b/README.md @@ -124,8 +124,9 @@ docker run $container bamtools --version ``` Available build templates: -- `conda/micromamba:v1` - Default Conda build using Micromamba 1.x -- `conda/micromamba:v2` - Multi-stage build using Micromamba 2.x +- `conda/micromamba:v1` - Single-stage build using Micromamba 1.x +- `conda/micromamba:v2` - Multi-stage build using Micromamba 2.x (default for Conda packages) +- `conda/micromamba:v3` - Like `conda/micromamba:v2`, with the Conda environment split into multiple image layers grouped by package, each under 512 MB. Docker images only - `conda/pixi:v1` - Multi-stage build using Pixi package manager - `cran/installr:v1` - Build template for CRAN/R packages diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java index 27268a0..f868aa4 100644 --- a/app/src/main/java/io/seqera/wave/cli/App.java +++ b/app/src/main/java/io/seqera/wave/cli/App.java @@ -232,7 +232,7 @@ public class App implements Runnable { @Option(names = {"--build-compression"}, paramLabel = "", description = "Specify the compression algorithm to be used for the build context, it can be 'gzip', 'zstd' or 'estargz'") private BuildCompression.Mode buildCompression; - @Option(names = {"--build-template"}, paramLabel = "", description = "Specify the build template to be used for building the container, e.g. 'conda/pixi:v1', 'conda/micromamba:v1', 'conda/micromamba:v2', 'cran/installr:v1'") + @Option(names = {"--build-template"}, paramLabel = "", description = "Specify the build template to be used for building the container, e.g. 'conda/pixi:v1', 'conda/micromamba:v1', 'conda/micromamba:v2', 'conda/micromamba:v3', 'cran/installr:v1'") private String buildTemplate; public static void main(String[] args) { diff --git a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy index e809bb5..deaf998 100644 --- a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy +++ b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy @@ -348,17 +348,20 @@ class AppTest extends Specification { req.buildTemplate == 'conda/pixi:v1' } - def 'should set build template micromamba' () { + def 'should set build template #TEMPLATE' () { given: def app = new App() - String[] args = ["--build-template", 'conda/micromamba:v2'] + String[] args = ["--build-template", TEMPLATE] when: new CommandLine(app).parseArgs(args) and: def req = app.createRequest() then: - req.buildTemplate == 'conda/micromamba:v2' + req.buildTemplate == TEMPLATE + + where: + TEMPLATE << ['conda/micromamba:v2', 'conda/micromamba:v3'] } def 'should not allow dry-run and await' () { From c63e96f7975a1e83a71059dbd640fc8b71266a74 Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Fri, 2 Oct 2026 17:35:22 +0200 Subject: [PATCH 2/3] Rename the conda/micromamba:v3 template to conda/micromamba:v2-fast Co-Authored-By: Claude Opus 5.5 --- README.md | 2 +- app/src/main/java/io/seqera/wave/cli/App.java | 2 +- app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 89e7039..ba2e62b 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ docker run $container bamtools --version Available build templates: - `conda/micromamba:v1` - Single-stage build using Micromamba 1.x - `conda/micromamba:v2` - Multi-stage build using Micromamba 2.x (default for Conda packages) -- `conda/micromamba:v3` - Like `conda/micromamba:v2`, with the Conda environment split into multiple image layers grouped by package, each under 512 MB. Docker images only +- `conda/micromamba:v2-fast` - Like `conda/micromamba:v2`, with the Conda environment split into multiple image layers grouped by package, each under 512 MB. Docker images only - `conda/pixi:v1` - Multi-stage build using Pixi package manager - `cran/installr:v1` - Build template for CRAN/R packages diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java index f868aa4..cd5ed3d 100644 --- a/app/src/main/java/io/seqera/wave/cli/App.java +++ b/app/src/main/java/io/seqera/wave/cli/App.java @@ -232,7 +232,7 @@ public class App implements Runnable { @Option(names = {"--build-compression"}, paramLabel = "", description = "Specify the compression algorithm to be used for the build context, it can be 'gzip', 'zstd' or 'estargz'") private BuildCompression.Mode buildCompression; - @Option(names = {"--build-template"}, paramLabel = "", description = "Specify the build template to be used for building the container, e.g. 'conda/pixi:v1', 'conda/micromamba:v1', 'conda/micromamba:v2', 'conda/micromamba:v3', 'cran/installr:v1'") + @Option(names = {"--build-template"}, paramLabel = "", description = "Specify the build template to be used for building the container, e.g. 'conda/pixi:v1', 'conda/micromamba:v1', 'conda/micromamba:v2', 'conda/micromamba:v2-fast', 'cran/installr:v1'") private String buildTemplate; public static void main(String[] args) { diff --git a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy index deaf998..41a3373 100644 --- a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy +++ b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy @@ -361,7 +361,7 @@ class AppTest extends Specification { req.buildTemplate == TEMPLATE where: - TEMPLATE << ['conda/micromamba:v2', 'conda/micromamba:v3'] + TEMPLATE << ['conda/micromamba:v2', 'conda/micromamba:v2-fast'] } def 'should not allow dry-run and await' () { From dbe4fc8cafdec11d46d7168876c1ad22d4401679 Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Mon, 5 Oct 2026 14:47:22 +0200 Subject: [PATCH 3/3] Add conda/pixi:v1-fast to the --build-template help Co-Authored-By: Claude Opus 5.5 --- README.md | 1 + app/src/main/java/io/seqera/wave/cli/App.java | 2 +- app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ba2e62b..539d79e 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,7 @@ Available build templates: - `conda/micromamba:v2` - Multi-stage build using Micromamba 2.x (default for Conda packages) - `conda/micromamba:v2-fast` - Like `conda/micromamba:v2`, with the Conda environment split into multiple image layers grouped by package, each under 512 MB. Docker images only - `conda/pixi:v1` - Multi-stage build using Pixi package manager +- `conda/pixi:v1-fast` - Like `conda/pixi:v1`, with the Conda environment split into multiple image layers grouped by package, each under 512 MB. Docker images only - `cran/installr:v1` - Build template for CRAN/R packages #### Build a container by using a Conda environment file diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java index cd5ed3d..bfd503d 100644 --- a/app/src/main/java/io/seqera/wave/cli/App.java +++ b/app/src/main/java/io/seqera/wave/cli/App.java @@ -232,7 +232,7 @@ public class App implements Runnable { @Option(names = {"--build-compression"}, paramLabel = "", description = "Specify the compression algorithm to be used for the build context, it can be 'gzip', 'zstd' or 'estargz'") private BuildCompression.Mode buildCompression; - @Option(names = {"--build-template"}, paramLabel = "", description = "Specify the build template to be used for building the container, e.g. 'conda/pixi:v1', 'conda/micromamba:v1', 'conda/micromamba:v2', 'conda/micromamba:v2-fast', 'cran/installr:v1'") + @Option(names = {"--build-template"}, paramLabel = "", description = "Specify the build template to be used for building the container, e.g. 'conda/pixi:v1', 'conda/pixi:v1-fast', 'conda/micromamba:v1', 'conda/micromamba:v2', 'conda/micromamba:v2-fast', 'cran/installr:v1'") private String buildTemplate; public static void main(String[] args) { diff --git a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy index 41a3373..b4ea45a 100644 --- a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy +++ b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy @@ -361,7 +361,7 @@ class AppTest extends Specification { req.buildTemplate == TEMPLATE where: - TEMPLATE << ['conda/micromamba:v2', 'conda/micromamba:v2-fast'] + TEMPLATE << ['conda/micromamba:v2', 'conda/micromamba:v2-fast', 'conda/pixi:v1-fast'] } def 'should not allow dry-run and await' () {