Skip to content

Commit 6a6a11f

Browse files
committed
Update container definition
1 parent 9859dee commit 6a6a11f

File tree

1 file changed

+37
-43
lines changed

1 file changed

+37
-43
lines changed

Dockerfile

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
FROM condaforge/mambaforge:latest
1+
FROM condaforge/miniforge3:latest
22
LABEL io.github.snakemake.containerized="true"
3-
LABEL io.github.snakemake.conda_env_hash="e5f6ff0e9e827d0d6bf8717bb46f3394c2356786ca7cde04716f3dd7488a0a45"
3+
LABEL io.github.snakemake.conda_env_hash="537ab21812cff05914015e48d38a0368b2bc608f2ac2152eaa5fe53f4cffd98b"
44

5-
RUN apt-get update && apt-get install -y curl
6-
7-
# Step 1: Retrieve conda environments
5+
# Step 2: Retrieve conda environments
86

97
# Conda environment:
108
# source: workflow/envs/biopython.yaml
11-
# prefix: /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8
9+
# prefix: /conda-envs/a87373c85b4b4d0bc0742b01f5ffadf8
1210
# channels:
1311
# - conda-forge
1412
# - bioconda
@@ -17,22 +15,22 @@ RUN apt-get update && apt-get install -y curl
1715
# - biopython==1.81
1816
# - pandas==2.0.3
1917
# - pip==23.2.1
20-
# - mafft==7.520
21-
# - gb2seq==0.2.20 (pip)
22-
RUN mkdir -p /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8
23-
COPY workflow/envs/biopython.yaml /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8/environment.yaml
24-
COPY workflow/envs/biopython.post-deploy.sh /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8/post-deploy.sh
18+
# - pip:
19+
# - gb2seq==0.2.20
20+
RUN mkdir -p /conda-envs/a87373c85b4b4d0bc0742b01f5ffadf8
21+
COPY workflow/envs/biopython.yaml /conda-envs/a87373c85b4b4d0bc0742b01f5ffadf8/environment.yaml
2522

2623
# Conda environment:
2724
# source: workflow/envs/fetch.yaml
28-
# prefix: /conda-envs/446520408112f3597796f452c95a7517
25+
# prefix: /conda-envs/9439457f932a4fbca3665c9ea1ac2f0a
2926
# channels:
3027
# - bioconda
3128
# - conda-forge
3229
# dependencies:
3330
# - entrez-direct==16.2
34-
RUN mkdir -p /conda-envs/446520408112f3597796f452c95a7517
35-
COPY workflow/envs/fetch.yaml /conda-envs/446520408112f3597796f452c95a7517/environment.yaml
31+
# - curl
32+
RUN mkdir -p /conda-envs/9439457f932a4fbca3665c9ea1ac2f0a
33+
COPY workflow/envs/fetch.yaml /conda-envs/9439457f932a4fbca3665c9ea1ac2f0a/environment.yaml
3634

3735
# Conda environment:
3836
# source: workflow/envs/freyja.yaml
@@ -47,19 +45,17 @@ COPY workflow/envs/freyja.yaml /conda-envs/ee7a2e1b4ec9a7a9999f34dddaea0605/envi
4745

4846
# Conda environment:
4947
# source: workflow/envs/gisaidr.yaml
50-
# prefix: /conda-envs/da7a255722228900ab1eeedd1878e1c7
48+
# prefix: /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f
5149
# channels:
5250
# - conda-forge
5351
# dependencies:
5452
# - r-base=4.1.3
5553
# - r-tidyverse==2.0.0
5654
# - r-devtools==2.4.5
5755
# - r-logger==0.2.2
58-
# - Wytamma/GISAIDR (R)
59-
# - curl (R)
60-
RUN mkdir -p /conda-envs/da7a255722228900ab1eeedd1878e1c7
61-
COPY workflow/envs/gisaidr.yaml /conda-envs/da7a255722228900ab1eeedd1878e1c7/environment.yaml
62-
COPY workflow/envs/gisaidr.post-deploy.sh /conda-envs/da7a255722228900ab1eeedd1878e1c7/post-deploy.sh
56+
RUN mkdir -p /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f
57+
COPY workflow/envs/gisaidr.yaml /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f/environment.yaml
58+
COPY workflow/envs/gisaidr.post-deploy.sh /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f/post-deploy.sh
6359

6460
# Conda environment:
6561
# source: workflow/envs/iqtree.yaml
@@ -85,14 +81,14 @@ COPY workflow/envs/nextalign.yaml /conda-envs/04a3347f94ddf7e21c34bc49e5246076/e
8581

8682
# Conda environment:
8783
# source: workflow/envs/pangolin.yaml
88-
# prefix: /conda-envs/efc6ee175cf0def0e180f8f2f7dd529d
84+
# prefix: /conda-envs/fd645c541ee7a3d43fb9167441b77888
8985
# channels:
9086
# - conda-forge
9187
# - bioconda
9288
# dependencies:
93-
# - pangolin==4.3
94-
RUN mkdir -p /conda-envs/efc6ee175cf0def0e180f8f2f7dd529d
95-
COPY workflow/envs/pangolin.yaml /conda-envs/efc6ee175cf0def0e180f8f2f7dd529d/environment.yaml
89+
# - pangolin==4.3.1
90+
RUN mkdir -p /conda-envs/fd645c541ee7a3d43fb9167441b77888
91+
COPY workflow/envs/pangolin.yaml /conda-envs/fd645c541ee7a3d43fb9167441b77888/environment.yaml
9692

9793
# Conda environment:
9894
# source: workflow/envs/quarto_render.yaml
@@ -159,27 +155,25 @@ COPY workflow/envs/snpeff.yaml /conda-envs/1934df0e4df02a7ee33c52f53f9e3c30/envi
159155
RUN mkdir -p /conda-envs/5150d0f0a91d7f7a789a06f453d63479
160156
COPY workflow/envs/var_calling.yaml /conda-envs/5150d0f0a91d7f7a789a06f453d63479/environment.yaml
161157

162-
# Step 2: Generate conda environments
158+
# Step 3: Generate conda environments
163159

164-
RUN mamba env create --prefix /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8 --file /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8/environment.yaml && \
165-
mamba env create --prefix /conda-envs/446520408112f3597796f452c95a7517 --file /conda-envs/446520408112f3597796f452c95a7517/environment.yaml && \
166-
mamba env create --prefix /conda-envs/ee7a2e1b4ec9a7a9999f34dddaea0605 --file /conda-envs/ee7a2e1b4ec9a7a9999f34dddaea0605/environment.yaml && \
167-
mamba env create --prefix /conda-envs/da7a255722228900ab1eeedd1878e1c7 --file /conda-envs/da7a255722228900ab1eeedd1878e1c7/environment.yaml && \
168-
mamba env create --prefix /conda-envs/0a608afb24723cb6fa8aef748f5efbc8 --file /conda-envs/0a608afb24723cb6fa8aef748f5efbc8/environment.yaml && \
169-
mamba env create --prefix /conda-envs/04a3347f94ddf7e21c34bc49e5246076 --file /conda-envs/04a3347f94ddf7e21c34bc49e5246076/environment.yaml && \
170-
mamba env create --prefix /conda-envs/efc6ee175cf0def0e180f8f2f7dd529d --file /conda-envs/efc6ee175cf0def0e180f8f2f7dd529d/environment.yaml && \
171-
mamba env create --prefix /conda-envs/f2a098519cf1f8c4cecb3c13f8c92883 --file /conda-envs/f2a098519cf1f8c4cecb3c13f8c92883/environment.yaml && \
172-
mamba env create --prefix /conda-envs/4b57bfc237ddc217c1f0b04d34dc06ef --file /conda-envs/4b57bfc237ddc217c1f0b04d34dc06ef/environment.yaml && \
173-
mamba env create --prefix /conda-envs/1934df0e4df02a7ee33c52f53f9e3c30 --file /conda-envs/1934df0e4df02a7ee33c52f53f9e3c30/environment.yaml && \
174-
mamba env create --prefix /conda-envs/5150d0f0a91d7f7a789a06f453d63479 --file /conda-envs/5150d0f0a91d7f7a789a06f453d63479/environment.yaml && \
175-
mamba clean --all -y
160+
RUN conda env create --prefix /conda-envs/a87373c85b4b4d0bc0742b01f5ffadf8 --file /conda-envs/a87373c85b4b4d0bc0742b01f5ffadf8/environment.yaml && \
161+
conda env create --prefix /conda-envs/9439457f932a4fbca3665c9ea1ac2f0a --file /conda-envs/9439457f932a4fbca3665c9ea1ac2f0a/environment.yaml && \
162+
conda env create --prefix /conda-envs/ee7a2e1b4ec9a7a9999f34dddaea0605 --file /conda-envs/ee7a2e1b4ec9a7a9999f34dddaea0605/environment.yaml && \
163+
conda env create --prefix /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f --file /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f/environment.yaml && \
164+
conda env create --prefix /conda-envs/0a608afb24723cb6fa8aef748f5efbc8 --file /conda-envs/0a608afb24723cb6fa8aef748f5efbc8/environment.yaml && \
165+
conda env create --prefix /conda-envs/04a3347f94ddf7e21c34bc49e5246076 --file /conda-envs/04a3347f94ddf7e21c34bc49e5246076/environment.yaml && \
166+
conda env create --prefix /conda-envs/fd645c541ee7a3d43fb9167441b77888 --file /conda-envs/fd645c541ee7a3d43fb9167441b77888/environment.yaml && \
167+
conda env create --prefix /conda-envs/f2a098519cf1f8c4cecb3c13f8c92883 --file /conda-envs/f2a098519cf1f8c4cecb3c13f8c92883/environment.yaml && \
168+
conda env create --prefix /conda-envs/4b57bfc237ddc217c1f0b04d34dc06ef --file /conda-envs/4b57bfc237ddc217c1f0b04d34dc06ef/environment.yaml && \
169+
conda env create --prefix /conda-envs/1934df0e4df02a7ee33c52f53f9e3c30 --file /conda-envs/1934df0e4df02a7ee33c52f53f9e3c30/environment.yaml && \
170+
conda env create --prefix /conda-envs/5150d0f0a91d7f7a789a06f453d63479 --file /conda-envs/5150d0f0a91d7f7a789a06f453d63479/environment.yaml && \
171+
conda clean --all -y
176172

177-
# Step 3: Run post-deploy scripts
173+
# Step 4: Run post-deploy scripts
178174

179175
RUN conda init && . /root/.bashrc && \
180-
conda activate /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8 && \
181-
bash /conda-envs/80434b30d852d88ac0d9f0dc4712fcc8/post-deploy.sh && \
182-
conda activate /conda-envs/da7a255722228900ab1eeedd1878e1c7 && \
183-
bash /conda-envs/da7a255722228900ab1eeedd1878e1c7/post-deploy.sh && \
176+
conda activate /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f && \
177+
bash /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f/post-deploy.sh && \
184178
conda deactivate && \
185-
mamba clean --all -y
179+
conda clean --all -y

0 commit comments

Comments
 (0)