Skip to content

Commit 012c96d

Browse files
committed
Conda yaml dev
1 parent b129147 commit 012c96d

File tree

2 files changed

+33
-43
lines changed

2 files changed

+33
-43
lines changed

Dockerfile

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,23 @@ ENV TZ=Europe/Ljubljana
88
# thanks to https://github.com/bschiffthaler/ngs/blob/master/base/Dockerfile
99
# and https://github.com/AveraSD/ngs-docker-star/blob/master/Dockerfile
1010

11+
SHELL ["/bin/bash", "-c"]
12+
1113
RUN conda update -n base -c defaults conda -y
14+
RUN conda install -c conda-forge mamba -y
1215

13-
RUN conda update -n base -c defaults conda
1416
RUN conda config --add channels defaults
1517
RUN conda config --add channels bioconda
1618
RUN conda config --add channels conda-forge
1719

1820
### samtools
19-
RUN conda install -c bioconda -y "samtools>=1.10"
21+
#RUN conda install -c bioconda -y "samtools>=1.10"
2022

2123
### bedtools, need at least version 2.26, where merge command reports strand
22-
RUN conda install -c bioconda -y bedtools
24+
# RUN conda install -c bioconda -y bedtools
2325

2426
### RNA-star
25-
RUN conda install -c bioconda -y star
26-
27-
### numpy
28-
29-
30-
#USER root
31-
# to speed-up building of Docker images
32-
#RUN /home/icuser/.icountenv/bin/pip install numpy pandas pysam pybedtools numpydoc matplotlib
27+
# RUN conda install -c bioconda -y star
3328

3429
#################
3530
#### iCount
@@ -45,15 +40,10 @@ RUN git clone https://github.com/tomazc/iCount.git --branch snakemake
4540

4641
RUN conda create -c conda-forge -c bioconda -n iCount_pipeline3 -y
4742
RUN conda init bash
48-
RUN exec bash # restart shell
49-
RUN conda activate iCount_pipeline3
50-
RUN conda install -c conda-forge mamba -y
51-
RUN conda env update --file iCount/iCount/snakemake/envs/environment_iCount.yaml # needs ~ 4 GB RAM, otherwise killed
52-
53-
USER root
54-
RUN echo "conda activate iCount_pipeline3" >> /etc/bash.bashrc
43+
RUN echo "conda activate iCount_pipeline3" >> ~/.bashrc
44+
#RUN conda env update --file iCount/conda_iCount.yaml # needs ~ 4 GB RAM, otherwise killed
45+
#RUN pip install ./iCount
5546

56-
USER icuser
57-
ENV PATH /home/icuser/bin:$PATH
58-
WORKDIR /home/icuser
59-
CMD ["/bin/bash"]
47+
#ENV PATH /home/icuser/bin:$PATH
48+
#WORKDIR /home/icuser
49+
#CMD ["/bin/bash"]

conda_iCount.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
channels:
2+
- defaults
23
- bioconda
34
- conda-forge
45

56
dependencies:
6-
- snakemake =5.5.4
7-
- python =3.8
8-
- jinja2 =2.10.1
9-
- networkx =2.3
10-
- bcftools =1.9
11-
- samtools
12-
- bwa =0.7.17
13-
- pysam = 0.14
14-
- cutadapt =2.4
15-
- bedtools =2.28
16-
- STAR =2.7.2a
7+
- python = 3.8.6
8+
- snakemake = 5.5.4
9+
- jinja2 = 2.10.1
10+
- networkx = 2.3
11+
- bcftools = 1.9
12+
- samtools = 1.10
13+
- bwa = 0.7.17
14+
- pysam = 0.16.0
15+
- cutadapt = 2.4
16+
- bedtools = 2.28
17+
- STAR = 2.7.2a
1718
- trim-galore = 0.6.4
18-
- pip =19.2.3
19-
- pybedtools =0.8.0
20-
- numpy =1.17.1
21-
- pandas =0.25.1
22-
- pybedtools =0.8.0
23-
- numpydoc =0.9.1
24-
- sphinx =2.2.0
25-
- matplotlib =3.1.0
19+
- pip = 20.2.4
20+
- pybedtools = 0.8.0
21+
- numpy = 1.17.1
22+
- pandas = 0.25.1
23+
- pybedtools = 0.8.0
24+
- numpydoc = 0.9.1
25+
- sphinx = 2.2.0
26+
- matplotlib = 3.1.0
2627
- docutils = 0.15.2
27-
- sphinx_rtd_theme =0.4.3
28-
- sphinx-releases =1.6.1
28+
- sphinx-releases = 1.6.1

0 commit comments

Comments
 (0)