Skip to content

Commit b129147

Browse files
committed
Renamed and moved environment_iCount.yaml yo conda_iCount.yaml (moved to root folder). Changed requirement of python 3.6 to 3.8, removed samtools requirement of 1.9.
1 parent f028e64 commit b129147

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

Dockerfile

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,36 @@ RUN conda install -c bioconda -y bedtools
2424
### RNA-star
2525
RUN conda install -c bioconda -y star
2626

27-
#################
28-
#### iCount
29-
#################
27+
### numpy
3028

31-
#RUN useradd -m -d /home/icuser icuser
32-
33-
#RUN chown -R icuser.icuser /home/icuser
34-
35-
#USER icuser
36-
#WORKDIR /home/icuser
37-
#RUN virtualenv -p python3 /home/icuser/.icountenv
3829

3930
#USER root
4031
# to speed-up building of Docker images
4132
#RUN /home/icuser/.icountenv/bin/pip install numpy pandas pysam pybedtools numpydoc matplotlib
4233

43-
#ADD . /home/icuser/iCount_src
44-
#RUN chown -R icuser.icuser /home/icuser
45-
46-
#USER icuser
47-
#WORKDIR /home/icuser/iCount_src
48-
49-
#RUN ../.icountenv/bin/pip install -e .[docs,test]
34+
#################
35+
#### iCount
36+
#################
5037

51-
#USER root
52-
#RUN echo "source /home/icuser/.icountenv/bin/activate" >> /etc/bash.bashrc
53-
#USER icuser
38+
RUN useradd -m -d /home/icuser icuser
39+
RUN chown -R icuser.icuser /home/icuser
5440

55-
#RUN mkdir /home/icuser/storage
41+
USER icuser
42+
WORKDIR /home/icuser
43+
RUN mkdir /home/icuser/storage
44+
RUN git clone https://github.com/tomazc/iCount.git --branch snakemake
5645

57-
#ENV PATH /home/icuser/bin:$PATH
46+
RUN conda create -c conda-forge -c bioconda -n iCount_pipeline3 -y
47+
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
5852

59-
#WORKDIR /home/icuser
53+
USER root
54+
RUN echo "conda activate iCount_pipeline3" >> /etc/bash.bashrc
6055

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

iCount/snakemake/envs/environment_iCount.yaml renamed to conda_iCount.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ channels:
44

55
dependencies:
66
- snakemake =5.5.4
7-
- python =3.6
7+
- python =3.8
88
- jinja2 =2.10.1
99
- networkx =2.3
1010
- bcftools =1.9
11-
- samtools =1.9
11+
- samtools
1212
- bwa =0.7.17
1313
- pysam = 0.14
1414
- cutadapt =2.4
@@ -25,4 +25,4 @@ dependencies:
2525
- matplotlib =3.1.0
2626
- docutils = 0.15.2
2727
- sphinx_rtd_theme =0.4.3
28-
- sphinx-releases =1.6.1
28+
- sphinx-releases =1.6.1

0 commit comments

Comments
 (0)