From 8370956a41a7805490c5236a70facd3b34e00acf Mon Sep 17 00:00:00 2001
From: Shaman <shaman.narayanasamy@uni.lu>
Date: Thu, 16 Apr 2015 17:44:10 +0200
Subject: [PATCH] Docker file update
---
docker/Dockerfile | 13 +++++--------
lib/imp.js | 16 ++++++++--------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index afccaba..0b86642 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -58,7 +58,6 @@ RUN mkdir -p /home/imp/tmp /home/imp/lib \
#&& mkdir -p /usr/db/trimmomatic \
#&& cp adapters/* /usr/db/trimmomatic/. \
&& cd .. && rm -rf *rimmomatic*
-
## idba ud
RUN wget http://hku-idba.googlecode.com/files/idba-1.1.1.tar.gz \
&& tar -xzf idba-1.1.1.tar.gz \
@@ -82,7 +81,6 @@ RUN wget http://hku-idba.googlecode.com/files/idba-1.1.1.tar.gz \
&& make \
&& mv bwa /usr/bin \
&& cd .. && rm -rf bwa*
-
## htqc toolbox
RUN wget http://downloads.sourceforge.net/project/htqc/htqc-1.91.1-Source.tar.gz \
&& tar -xzf htqc-1.91.1-Source.tar.gz \
@@ -93,12 +91,6 @@ RUN wget http://downloads.sourceforge.net/project/htqc/htqc-1.91.1-Source.tar.gz
&& make \
&& make install \
&& cd ../.. && rm -rf htqc* \
-## cufflinks
-&& wget http://cole-trapnell-lab.github.io/cufflinks/assets/downloads/cufflinks-2.2.1.Linux_x86_64.tar.gz \
-&& tar -xzf cufflinks-2.2.1.Linux_x86_64.tar.gz \
-&& cd cufflinks-2.2.1.Linux_x86_64 \
-&& cp cuffcompare cuffdiff cufflinks cuffmerge cuffnorm cuffquant gffread gtf_to_sam /usr/bin \
-&& cd .. && rm -rf cufflinks* \
## freebayes
&& git clone --recursive git://github.com/ekg/freebayes.git \
&& cd freebayes \
@@ -140,6 +132,11 @@ RUN wget http://www.vicbioinformatics.com/prokka-1.11.tar.gz \
&& mv scripts/*.sh /home/imp/lib/. \
&& cd .. && rm -rf sortmerna* \
&& cd /home/imp/lib
+# Bedtools
+RUN git clone https://github.com/arq5x/bedtools2.git
+&& cd bedtools2/
+&& git checkout v2.22.0
+&& make
# bh_tsne
RUN cd /home/imp/tmp \
&& git clone https://github.com/claczny/VizBin.git \
diff --git a/lib/imp.js b/lib/imp.js
index a5879a6..6bde093 100644
--- a/lib/imp.js
+++ b/lib/imp.js
@@ -257,7 +257,7 @@ if(typeof IMP_STATS !== 'undefined') {
// ht_stats
-renderStatsCarousel("carousel-mg-raw", "MG/stats", [
+renderStatsCarousel("carousel-mg-raw", "Preprocessing/stats/MG", [
"cycle_composition_2.png",
"cycle_quality_1.png",
"cycle_quality_2.png",
@@ -270,7 +270,7 @@ renderStatsCarousel("carousel-mg-raw", "MG/stats", [
"reads_quality.png"
]);
-renderStatsCarousel("carousel-mg-preprocessed", "MG/stats_after_preprocessing", [
+renderStatsCarousel("carousel-mg-preprocessed", "Preprocessing/stats_after_preprocessing/MG", [
"cycle_composition_2.png",
"cycle_quality_1.png",
"cycle_quality_2.png",
@@ -283,7 +283,7 @@ renderStatsCarousel("carousel-mg-preprocessed", "MG/stats_after_preprocessing",
"reads_quality.png"
]);
-renderStatsCarousel("carousel-mt-raw", "MT/stats", [
+renderStatsCarousel("carousel-mt-raw", "Preprocessing/stats/MT", [
"cycle_composition_2.png",
"cycle_quality_1.png",
"cycle_quality_2.png",
@@ -296,7 +296,7 @@ renderStatsCarousel("carousel-mt-raw", "MT/stats", [
"reads_quality.png"
]);
-renderStatsCarousel("carousel-mt-preprocessed", "MT/stats_after_preprocessing", [
+renderStatsCarousel("carousel-mt-preprocessed", "Preprocessing/stats_after_preprocessing/MT", [
"cycle_composition_2.png",
"cycle_quality_1.png",
"cycle_quality_2.png",
@@ -309,12 +309,12 @@ renderStatsCarousel("carousel-mt-preprocessed", "MT/stats_after_preprocessing",
"reads_quality.png"
]);
-renderSimpleCarousel('carousel-assembly', 'MGMT/results', [
+renderSimpleCarousel('carousel-assembly', 'Analysis/results', [
'IMP-vizbin_length.png',
'IMP-vizbin_length_GC.png'
]);
-renderSimpleCarousel('carousel-mapping', 'MGMT/results', [
+renderSimpleCarousel('carousel-mapping', 'Analysis/results', [
'IMP-reads_density.png',
'IMP-rpkm_density.png',
'IMP-coverage_density.png',
@@ -325,12 +325,12 @@ renderSimpleCarousel('carousel-mapping', 'MGMT/results', [
'IMP-vizbin_length_MTdepth.png'
]);
-renderSimpleCarousel('carousel-ration', 'MGMT/results', [
+renderSimpleCarousel('carousel-ration', 'Analysis/results', [
'IMP-vizbin_length_depthRatio.png',
'IMP-vizbin_length_rpkmRatio.png'
]);
-renderSimpleCarousel('carousel-variant', 'MGMT/results', [
+renderSimpleCarousel('carousel-variant', 'Analysis/results', [
'IMP-var_count.png',
'IMP-var_density.png',
'IMP-vizbin_length_MGvardens.png',
--
GitLab