added --name base

Signed-off-by: munishchouhan <[email protected]>
seqeralabs · Sep 17, 2024 · 2c8ecd3 · 2c8ecd3
1 parent 535b3e5
commit 2c8ecd3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/wave-utils/src/main/resources/templates/conda/dockerfile-conda-file.txt b/wave-utils/src/main/resources/templates/conda/dockerfile-conda-file.txt
@@ -2,7 +2,7 @@ FROM {{base_image}}
 COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
 RUN micromamba install -y -n base -f /tmp/conda.yml \
     {{base_packages}}
-    && micromamba env export --explicit > environment.lock
+    && micromamba env export --name base --explicit > environment.lock
 
 RUN echo "conda_lock_start" \
     && cat environment.lock \

diff --git a/wave-utils/src/main/resources/templates/conda/dockerfile-conda-packages.txt b/wave-utils/src/main/resources/templates/conda/dockerfile-conda-packages.txt
@@ -2,7 +2,7 @@ FROM {{base_image}}
 RUN \
     micromamba install -y -n base {{channel_opts}} {{target}} \
     {{base_packages}}
-    && micromamba env export --explicit > environment.lock
+    && micromamba env export --name base --explicit > environment.lock
 
 RUN echo "conda_lock_start" \
     && cat environment.lock \

diff --git a/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy b/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy
@@ -374,7 +374,7 @@ class DockerHelperTest extends Specification {
                 COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
                 RUN micromamba install -y -n base -f /tmp/conda.yml \\
                     && micromamba install -y -n base foo::bar \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
 
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\
@@ -394,7 +394,7 @@ class DockerHelperTest extends Specification {
                 COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
                 RUN micromamba install -y -n base -f /tmp/conda.yml \\
                     && micromamba install -y -n base conda-forge::procps-ng \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
                     
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\
@@ -417,7 +417,7 @@ class DockerHelperTest extends Specification {
                 RUN \\
                     micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 \\
                     && micromamba install -y -n base conda-forge::procps-ng \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
                     
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\
@@ -441,7 +441,7 @@ class DockerHelperTest extends Specification {
                 RUN \\
                     micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 \\
                     && micromamba install -y -n base foo::one bar::two \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
                     
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\
@@ -464,7 +464,7 @@ class DockerHelperTest extends Specification {
                 RUN \\
                     micromamba install -y -n base -c foo -c bar bwa=0.7.15 salmon=1.1.1 \\
                     && micromamba install -y -n base conda-forge::procps-ng \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
                     
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\
@@ -488,7 +488,7 @@ class DockerHelperTest extends Specification {
                 RUN \\
                     micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 \\
                     && micromamba install -y -n base conda-forge::procps-ng \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
                     
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\
@@ -515,7 +515,7 @@ class DockerHelperTest extends Specification {
                 RUN \\
                     micromamba install -y -n base -c conda-forge -c defaults -f https://foo.com/some/conda-lock.yml \\
                     && micromamba install -y -n base conda-forge::procps-ng \\
-                    && micromamba env export --explicit > environment.lock
+                    && micromamba env export --name base --explicit > environment.lock
                     
                 RUN echo "conda_lock_start" \\
                     && cat environment.lock \\